mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source 
(cherry picked from commit 6ffd9b05df)

Co-authored-by: ziheng <zihenglv@gmail.com>
This commit is contained in:
Miss Islington (bot) 2019-06-24 11:27:57 -07:00 • committed by GitHub
parent b183b963f6
commit 76b72f6ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
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 #define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#ifdef HAVE_UUID_UUID_H #ifdef HAVE_UUID_UUID_H
#include <uuid/uuid.h> #include <uuid/uuid.h>
#endif #elif defined(HAVE_UUID_H)
#ifdef HAVE_UUID_H
#include <uuid.h> #include <uuid.h>
#endif #endif
static PyObject * static PyObject *
py_uuid_generate_time_safe(PyObject *Py_UNUSED(context), py_uuid_generate_time_safe(PyObject *Py_UNUSED(context),
PyObject *Py_UNUSED(ignored)) PyObject *Py_UNUSED(ignored))