From: Gregory P. Smith <greg@krypto.org>
Date: Thu, 29 Jan 2015 00:07:52 +0000 (-0800)
Subject: Always #define _PyLong_FromDev as we always need it to compile rather than
X-Git-Tag: v3.4.3rc1~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=702dada2c5f0f3e65bef4e086f4967cbe1efbb36;p=thirdparty%2FPython%2Fcpython.git

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?)
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 03798ca2e590..628dec29d7a5 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -623,6 +623,13 @@ fail:
 #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 @@ _Py_Dev_Converter(PyObject *obj, void *p)
         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