diff options
| author | ziheng <zihenglv@gmail.com> | 2019-06-25 01:59:51 +0800 |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2019-06-24 13:59:50 -0400 |
| commit | 6ffd9b05dfade9e3a101fe039157856eb855f82e (patch) | |
| tree | 9b86e127a26bd97292d4f444a2240cfc67e8e4d6 | |
| parent | 549f7d45c8d61ab7b1d4a4e266b9d790ad6f7504 (diff) | |
| download | cpython-git-6ffd9b05dfade9e3a101fe039157856eb855f82e.tar.gz | |
bpo-32627: Fix compile error when conflicting `_uuid` headers included (GH-11751)
| -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 0b7f2a2545..0b7aa72e91 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)) |