diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-06-24 18:27:57 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 18:27:57 (GMT) |
| commit | 76b72f6ea26de4280279a01863f30fccd2dde8f3 (patch) | |
| tree | 1744dcd0d776a82fa5fbf5a79cbc28e5efa72314 /Modules | |
| parent | b183b963f68e522e1bbba12a9c96ed7e0cc32e60 (diff) | |
| download | cpython-76b72f6ea26de4280279a01863f30fccd2dde8f3.zip cpython-76b72f6ea26de4280279a01863f30fccd2dde8f3.tar.gz cpython-76b72f6ea26de4280279a01863f30fccd2dde8f3.tar.bz2 | |
bpo-32627: Fix compile error when conflicting `_uuid` headers included (GH-11751)
(cherry picked from commit 6ffd9b05dfade9e3a101fe039157856eb855f82e)
Co-authored-by: ziheng <zihenglv@gmail.com>
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_uuidmodule.c | 9 |
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)) |