Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge heads

This commit is contained in:
Benjamin Peterson 2013-01-02 12:23:32 -06:00
parent 13a2707f95 404fa924c3
commit d1ae518c64
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/posixmodule.c
View File

@ -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