From e90815b3b16ab196c10f3a4dd91402cdc2e07d06 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 24 Jun 2019 11:18:22 -0700 Subject: bpo-32627: Fix compile error when conflicting `_uuid` headers included (GH-11751) (cherry picked from commit 6ffd9b05dfade9e3a101fe039157856eb855f82e) Co-authored-by: ziheng --- .../NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst | 1 + Modules/_uuidmodule.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst 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 -#endif -#ifdef HAVE_UUID_H +#elif defined(HAVE_UUID_H) #include #endif - static PyObject * py_uuid_generate_time_safe(void) { -- cgit v1.2.1