languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-15 23:46:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
ziheng 2019-06-25 01:59:51 +08:00 committed by Ned Deily
parent 549f7d45c8
commit 6ffd9b05df
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst Normal file
View file

@ -0,0 +1 @@
Fix compile error when ``_uuid`` headers conflicting included.

9
Modules/_uuidmodule.c
View file

@ -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))