summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorziheng <zihenglv@gmail.com>2019-06-24 17:59:51 (GMT)
committerNed Deily <nad@python.org>2019-06-24 17:59:50 (GMT)
commit6ffd9b05dfade9e3a101fe039157856eb855f82e (patch)
tree9b86e127a26bd97292d4f444a2240cfc67e8e4d6 /Modules
parent549f7d45c8d61ab7b1d4a4e266b9d790ad6f7504 (diff)
downloadcpython-6ffd9b05dfade9e3a101fe039157856eb855f82e.zip
cpython-6ffd9b05dfade9e3a101fe039157856eb855f82e.tar.gz
cpython-6ffd9b05dfade9e3a101fe039157856eb855f82e.tar.bz2
bpo-32627: Fix compile error when conflicting `_uuid` headers included (GH-11751)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_uuidmodule.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c
index 0b7f2a2..0b7aa72 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(PyObject *Py_UNUSED(context),
PyObject *Py_UNUSED(ignored))