From 702dada2c5f0f3e65bef4e086f4967cbe1efbb36 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Wed, 28 Jan 2015 16:07:52 -0800 Subject: [PATCH] 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?) --- Modules/posixmodule.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 03798ca2e59..628dec29d7a 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