Author adam@NetBSD.org
Recipients adam@NetBSD.org, christian.heimes, ncoghlan, vstinner
Date 2018-05-07.08:54:18
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1525683258.68.0.682650639539.issue32627@psf.upfronthosting.co.za>
In-reply-to
Content
Some systems might have both uuid.h and uuid/uuid.h. For example, NetBSD provides /usr/include/uuid.h, and one might also install libuuid from a package, and the latter has uuid/uuid.h.

To fix this, do not include both files, when both have been detected.

Here is a patch:

--- Modules/_uuidmodule.c.orig
+++ Modules/_uuidmodule.c
@@ -3,8 +3,7 @@
 #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
History
Date User Action Args
2018-05-07 08:54:18adam@NetBSD.orgsetrecipients: + adam@NetBSD.org, ncoghlan, vstinner, christian.heimes
2018-05-07 08:54:18adam@NetBSD.orgsetmessageid: <1525683258.68.0.682650639539.issue32627@psf.upfronthosting.co.za>
2018-05-07 08:54:18adam@NetBSD.orglinkissue32627 messages
2018-05-07 08:54:18adam@NetBSD.orgcreate