[Python-checkins] cpython (3.4): Always #define _PyLong_FromDev as we always need it to compile rather than
gregory.p.smith
python-checkins at python.org
Thu Jan 29 01:08:27 CET 2015
https://hg.python.org/cpython/rev/8fb1abedd3d5
changeset: 94362:8fb1abedd3d5
branch: 3.4
parent: 94360:1b35bef31bf8
user: Gregory P. Smith <greg at krypto.org>
date: Wed Jan 28 16:07:52 2015 -0800
summary:
Always #define _PyLong_FromDev as we always need it to compile rather than
only defining it when HAVE_MKNOD && HAVE_MAKEDEV are true.
This "oops" issue reported by John E. Malmberg on core-mentorship.
(what kinds of systems don't HAVE_MKNOD && HAVE_MAKEDEV?)
files:
Modules/posixmodule.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -623,6 +623,13 @@
#endif /* MS_WINDOWS */
+#ifdef HAVE_LONG_LONG
+# define _PyLong_FromDev PyLong_FromLongLong
+#else
+# define _PyLong_FromDev PyLong_FromLong
+#endif
+
+
#if defined(HAVE_MKNOD) && defined(HAVE_MAKEDEV)
static int
_Py_Dev_Converter(PyObject *obj, void *p)
@@ -636,14 +643,7 @@
return 0;
return 1;
}
-
-#ifdef HAVE_LONG_LONG
-# define _PyLong_FromDev PyLong_FromLongLong
-#else
-# define _PyLong_FromDev PyLong_FromLong
-#endif
-
-#endif
+#endif /* HAVE_MKNOD && HAVE_MAKEDEV */
#ifdef AT_FDCWD
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list