Skip to content

C
cpython
Kaydet (Commit) 6ffd9b05 authored tarafından ziheng's avatar ziheng Kaydeden (comit) Ned Deily
Dosyalara gözat
Seçenekler

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

üst 549f7d45
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst 0 → 100644
Dosyayı görüntüle @ 6ffd9b05
Fix compile error when ``_uuid`` headers conflicting included.
Modules/_uuidmodule.c
Dosyayı görüntüle @ 6ffd9b05
/*
* 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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment