diff options
-rw-r--r-- | Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst | 1 | ||||
-rw-r--r-- | Modules/_uuidmodule.c | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst b/Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst new file mode 100644 index 0000000000..16708aa5ee --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst @@ -0,0 +1 @@ +Fix compile error when ``_uuid`` headers conflicting included. diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c index 89499143a6..9e2589d896 100644 --- a/Modules/_uuidmodule.c +++ b/Modules/_uuidmodule.c @@ -1,14 +1,17 @@ +/* + * Python UUID module that wraps libuuid - + * DCE compatible Universally Unique Identifier library. + */ + #define PY_SSIZE_T_CLEAN #include "Python.h" #ifdef HAVE_UUID_UUID_H #include <uuid/uuid.h> -#endif -#ifdef HAVE_UUID_H +#elif defined(HAVE_UUID_H) #include <uuid.h> #endif - static PyObject * py_uuid_generate_time_safe(void) { |