]> granicus.if.org Git - python/commitdiff
Always #define _PyLong_FromDev as we always need it to compile rather than
authorGregory P. Smith <greg@krypto.org>
Thu, 29 Jan 2015 00:07:52 +0000 (16:07 -0800)
committerGregory P. Smith <greg@krypto.org>
Thu, 29 Jan 2015 00:07:52 +0000 (16:07 -0800)
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?)

Modules/posixmodule.c

index 03798ca2e5900b924cfd2924d9092903ea3ca659..628dec29d7a5e04c8151d2d88f3f6ed751034eb2 100644 (file)
@@ -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