Skip to content

[3.7] bpo-32627: Fix compile error when conflicting _uuid headers included (GH-11751) #14347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Jun 24, 2019
Merged

[3.7] bpo-32627: Fix compile error when conflicting _uuid headers included (GH-11751) #14347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix compile error when ``_uuid`` headers conflicting included.
9 changes: 6 additions & 3 deletions Modules/_uuidmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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(void)
{
Expand Down