bpo-32627: Fix compile error when conflicting `_uuid` headers included (GH-11751)

6ffd9b05 · ziheng · Ned Deily · 549f7d45 · 6ffd9b05 · 6ffd9b05
Commit 6ffd9b05 authored Jun 25, 2019 by ziheng Committed by Ned Deily Jun 24, 2019
Showing with 7 additions and 3 deletions

Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst ...S.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst +1 -0

Modules/_uuidmodule.c Modules/_uuidmodule.c +6 -3

No files found.
--- 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
+Fix compile error when ``_uuid`` headers conflicting included.
--- a/Modules/_uuidmodule.c
+++ b/Modules/_uuidmodule.c
+/*
+ * 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))