[patch] patch

0001-uuid-avoid-including-both-uuid-uuid.h-and-uuid.h.patch (text/plain), 737 bytes, created by Mike Gilbert on 2019-03-03 17:27:56 UTC

From d690f466291d662e9584f6b4339487de1a88b481 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <[e-mail]>
Date: Sun, 3 Mar 2019 12:24:39 -0500
Subject: [PATCH] uuid: avoid including both <uuid/uuid.h> and <uuid.h>

Bug: https://bugs.gentoo.org/663208
---
 Modules/_uuidmodule.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c
index 0b7f2a2545..a28d4d4d96 100644
--- a/Modules/_uuidmodule.c
+++ b/Modules/_uuidmodule.c
@@ -1,10 +1,9 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#ifdef HAVE_UUID_UUID_H
+#if defined(HAVE_UUID_UUID_H)
 #include <uuid/uuid.h>
-#endif
-#ifdef HAVE_UUID_H
+#elif defined(HAVE_UUID_H)
 #include <uuid.h>
 #endif
 
-- 
2.21.0