mirror of
https://github.com/python/cpython.git
synced 2025-10-03 05:35:59 +00:00
merge heads
This commit is contained in:
commit
d1ae518c64
1 changed files with 3 additions and 1 deletions
|
@ -1951,7 +1951,9 @@ _pystat_fromstructstat(STRUCT_STAT *st)
|
||||||
#else
|
#else
|
||||||
PyStructSequence_SET_ITEM(v, 1, PyLong_FromLong((long)st->st_ino));
|
PyStructSequence_SET_ITEM(v, 1, PyLong_FromLong((long)st->st_ino));
|
||||||
#endif
|
#endif
|
||||||
#if defined(HAVE_LONG_LONG) && !defined(MS_WINDOWS)
|
#ifdef MS_WINDOWS
|
||||||
|
PyStructSequence_SET_ITEM(v, 2, PyLong_FromUnsignedLong(st->st_dev));
|
||||||
|
#elif defined(HAVE_LONG_LONG)
|
||||||
PyStructSequence_SET_ITEM(v, 2,
|
PyStructSequence_SET_ITEM(v, 2,
|
||||||
PyLong_FromLongLong((PY_LONG_LONG)st->st_dev));
|
PyLong_FromLongLong((PY_LONG_LONG)st->st_dev));
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue