From b68f64f33ebec56b968bfb3fcadad9d2f1d005e6 Mon Sep 17 00:00:00 2001
From: ziheng <zihenglv@gmail.com>
Date: Sun, 3 Feb 2019 09:44:50 +0000
Subject: [PATCH 1/2] bpo-32627: Fix compile error when `_uuid` headers
 conflicting included

---
 Modules/_uuidmodule.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c
index 0b7f2a2545d4eb..0b7aa72e91a1c9 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))

From 70bed11703fc15aeff38937fd36631acdd5328c1 Mon Sep 17 00:00:00 2001
From: ziheng <zihenglv@gmail.com>
Date: Sun, 3 Feb 2019 11:20:34 +0000
Subject: [PATCH 2/2] bpo-32627: Add .rst to Misc/NEWS.d/next

---
 .../NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst | 1 +
 1 file changed, 1 insertion(+)
 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 00000000000000..16708aa5ee5458
--- /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.