Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-39583: Remove superfluous "extern C" bits from Include/cpython/*.h (GH-18413)

This commit is contained in:
Skip Montanaro 2020-06-01 13:35:56 -05:00 committed by GitHub
parent cbe1296922
commit b4d5a5cca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 2 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Include/cpython/abstract.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/* === Object Protocol ================================================== */ /* === Object Protocol ================================================== */
#ifdef PY_SSIZE_T_CLEAN #ifdef PY_SSIZE_T_CLEAN
@ -380,8 +376,4 @@ PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index,
PyAPI_FUNC(int) _Py_convert_optional_to_ssize_t(PyObject *, void *); PyAPI_FUNC(int) _Py_convert_optional_to_ssize_t(PyObject *, void *);
/* Same as PyNumber_Index but can return an instance of a subclass of int. */ /* Same as PyNumber_Index but can return an instance of a subclass of int. */
PyAPI_FUNC(PyObject *) _PyNumber_Index(PyObject *o); PyAPI_FUNC(PyObject *) _PyNumber_Index(PyObject *o);
#ifdef __cplusplus
}
#endif

8
Include/cpython/ceval.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *); PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *);
PyAPI_DATA(int) _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg); PyAPI_DATA(int) _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg);
PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *); PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
@ -32,7 +28,3 @@ PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc);
PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *); PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *);
PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *); PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *);
#ifdef __cplusplus
}
#endif

8
Include/cpython/dictobject.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
typedef struct _dictkeysobject PyDictKeysObject; typedef struct _dictkeysobject PyDictKeysObject;
/* The ma_values pointer is NULL for a combined table /* The ma_values pointer is NULL for a combined table
@ -86,7 +82,3 @@ typedef struct {
PyAPI_FUNC(PyObject *) _PyDictView_New(PyObject *, PyTypeObject *); PyAPI_FUNC(PyObject *) _PyDictView_New(PyObject *, PyTypeObject *);
PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other); PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
#ifdef __cplusplus
}
#endif

8
Include/cpython/fileobject.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *); PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
@ -26,7 +22,3 @@ typedef PyObject * (*Py_OpenCodeHookFunction)(PyObject *, void *);
PyAPI_FUNC(PyObject *) PyFile_OpenCode(const char *utf8path); PyAPI_FUNC(PyObject *) PyFile_OpenCode(const char *utf8path);
PyAPI_FUNC(PyObject *) PyFile_OpenCodeObject(PyObject *path); PyAPI_FUNC(PyObject *) PyFile_OpenCodeObject(PyObject *path);
PyAPI_FUNC(int) PyFile_SetOpenCodeHook(Py_OpenCodeHookFunction hook, void *userData); PyAPI_FUNC(int) PyFile_SetOpenCodeHook(Py_OpenCodeHookFunction hook, void *userData);
#ifdef __cplusplus
}
#endif

8
Include/cpython/frameobject.h
View File

@ -4,10 +4,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
typedef struct { typedef struct {
int b_type; /* what kind of block this is */ int b_type; /* what kind of block this is */
int b_handler; /* where to jump to find handler */ int b_handler; /* where to jump to find handler */
@ -78,7 +74,3 @@ PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *);
PyAPI_FUNC(void) _PyFrame_DebugMallocStats(FILE *out); PyAPI_FUNC(void) _PyFrame_DebugMallocStats(FILE *out);
PyAPI_FUNC(PyFrameObject *) PyFrame_GetBack(PyFrameObject *frame); PyAPI_FUNC(PyFrameObject *) PyFrame_GetBack(PyFrameObject *frame);
#ifdef __cplusplus
}
#endif

8
Include/cpython/import.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
PyMODINIT_FUNC PyInit__imp(void); PyMODINIT_FUNC PyInit__imp(void);
PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *); PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *);
@ -44,7 +40,3 @@ struct _frozen {
collection of frozen modules: */ collection of frozen modules: */
PyAPI_DATA(const struct _frozen *) PyImport_FrozenModules; PyAPI_DATA(const struct _frozen *) PyImport_FrozenModules;
#ifdef __cplusplus
}
#endif

6
Include/cpython/initconfig.h
View File

@ -1,9 +1,6 @@
#ifndef Py_PYCORECONFIG_H #ifndef Py_PYCORECONFIG_H
#define Py_PYCORECONFIG_H #define Py_PYCORECONFIG_H
#ifndef Py_LIMITED_API #ifndef Py_LIMITED_API
#ifdef __cplusplus
extern "C" {
#endif
/* --- PyStatus ----------------------------------------------- */ /* --- PyStatus ----------------------------------------------- */
@ -438,8 +435,5 @@ PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config,
PyWideStringList *list, PyWideStringList *list,
Py_ssize_t length, wchar_t **items); Py_ssize_t length, wchar_t **items);
#ifdef __cplusplus
}
#endif
#endif /* !Py_LIMITED_API */ #endif /* !Py_LIMITED_API */
#endif /* !Py_PYCORECONFIG_H */ #endif /* !Py_PYCORECONFIG_H */

8
Include/cpython/interpreteridobject.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/* Interpreter ID Object */ /* Interpreter ID Object */
PyAPI_DATA(PyTypeObject) _PyInterpreterID_Type; PyAPI_DATA(PyTypeObject) _PyInterpreterID_Type;
@ -13,7 +9,3 @@ PyAPI_DATA(PyTypeObject) _PyInterpreterID_Type;
PyAPI_FUNC(PyObject *) _PyInterpreterID_New(int64_t); PyAPI_FUNC(PyObject *) _PyInterpreterID_New(int64_t);
PyAPI_FUNC(PyObject *) _PyInterpreterState_GetIDObject(PyInterpreterState *); PyAPI_FUNC(PyObject *) _PyInterpreterState_GetIDObject(PyInterpreterState *);
PyAPI_FUNC(PyInterpreterState *) _PyInterpreterID_LookUp(PyObject *); PyAPI_FUNC(PyInterpreterState *) _PyInterpreterID_LookUp(PyObject *);
#ifdef __cplusplus
}
#endif

8
Include/cpython/listobject.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
typedef struct { typedef struct {
PyObject_VAR_HEAD PyObject_VAR_HEAD
/* Vector of pointers to list elements. list[0] is ob_item[0], etc. */ /* Vector of pointers to list elements. list[0] is ob_item[0], etc. */
@ -37,7 +33,3 @@ PyAPI_FUNC(void) _PyList_DebugMallocStats(FILE *out);
#define PyList_SET_ITEM(op, i, v) (_PyList_CAST(op)->ob_item[i] = (v)) #define PyList_SET_ITEM(op, i, v) (_PyList_CAST(op)->ob_item[i] = (v))
#define PyList_GET_SIZE(op) Py_SIZE(_PyList_CAST(op)) #define PyList_GET_SIZE(op) Py_SIZE(_PyList_CAST(op))
#define _PyList_ITEMS(op) (_PyList_CAST(op)->ob_item) #define _PyList_ITEMS(op) (_PyList_CAST(op)->ob_item)
#ifdef __cplusplus
}
#endif

8
Include/cpython/object.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
PyAPI_FUNC(void) _Py_NewReference(PyObject *op); PyAPI_FUNC(void) _Py_NewReference(PyObject *op);
#ifdef Py_TRACE_REFS #ifdef Py_TRACE_REFS
@ -548,7 +544,3 @@ PyAPI_FUNC(void) _PyTrash_end(struct _ts *tstate);
* unconditionally */ * unconditionally */
#define Py_TRASHCAN_SAFE_BEGIN(op) Py_TRASHCAN_BEGIN_CONDITION(op, 1) #define Py_TRASHCAN_SAFE_BEGIN(op) Py_TRASHCAN_BEGIN_CONDITION(op, 1)
#define Py_TRASHCAN_SAFE_END(op) Py_TRASHCAN_END #define Py_TRASHCAN_SAFE_END(op) Py_TRASHCAN_END
#ifdef __cplusplus
}
#endif

8
Include/cpython/objimpl.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
#define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize ) #define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize )
/* _PyObject_VAR_SIZE returns the number of bytes (as size_t) allocated for a /* _PyObject_VAR_SIZE returns the number of bytes (as size_t) allocated for a
@ -139,7 +135,3 @@ PyAPI_FUNC(PyObject *) _PyObject_GC_Calloc(size_t size);
#define PyType_SUPPORTS_WEAKREFS(t) ((t)->tp_weaklistoffset > 0) #define PyType_SUPPORTS_WEAKREFS(t) ((t)->tp_weaklistoffset > 0)
PyAPI_FUNC(PyObject **) PyObject_GET_WEAKREFS_LISTPTR(PyObject *op); PyAPI_FUNC(PyObject **) PyObject_GET_WEAKREFS_LISTPTR(PyObject *op);
#ifdef __cplusplus
}
#endif

8
Include/cpython/pyerrors.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/* Error objects */ /* Error objects */
/* PyException_HEAD defines the initial segment of every exception class. */ /* PyException_HEAD defines the initial segment of every exception class. */
@ -188,7 +184,3 @@ PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalErrorFormat(
...); ...);
#define Py_FatalError(message) _Py_FatalErrorFunc(__func__, message) #define Py_FatalError(message) _Py_FatalErrorFunc(__func__, message)
#ifdef __cplusplus
}
#endif

8
Include/cpython/pylifecycle.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/* Only used by applications that embed the interpreter and need to /* Only used by applications that embed the interpreter and need to
* override the standard encoding determination mechanism * override the standard encoding determination mechanism
*/ */
@ -66,7 +62,3 @@ PyAPI_FUNC(int) _Py_LegacyLocaleDetected(int warn);
PyAPI_FUNC(char *) _Py_SetLocaleFromEnv(int category); PyAPI_FUNC(char *) _Py_SetLocaleFromEnv(int category);
PyAPI_FUNC(PyThreadState *) _Py_NewInterpreter(int isolated_subinterpreter); PyAPI_FUNC(PyThreadState *) _Py_NewInterpreter(int isolated_subinterpreter);
#ifdef __cplusplus
}
#endif

8
Include/cpython/pymem.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
PyAPI_FUNC(void *) PyMem_RawMalloc(size_t size); PyAPI_FUNC(void *) PyMem_RawMalloc(size_t size);
PyAPI_FUNC(void *) PyMem_RawCalloc(size_t nelem, size_t elsize); PyAPI_FUNC(void *) PyMem_RawCalloc(size_t nelem, size_t elsize);
PyAPI_FUNC(void *) PyMem_RawRealloc(void *ptr, size_t new_size); PyAPI_FUNC(void *) PyMem_RawRealloc(void *ptr, size_t new_size);
@ -102,7 +98,3 @@ PyAPI_FUNC(void) PyMem_SetAllocator(PyMemAllocatorDomain domain,
The function does nothing if Python is not compiled is debug mode. */ The function does nothing if Python is not compiled is debug mode. */
PyAPI_FUNC(void) PyMem_SetupDebugHooks(void); PyAPI_FUNC(void) PyMem_SetupDebugHooks(void);
#ifdef __cplusplus
}
#endif

8
Include/cpython/pystate.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
#include "cpython/initconfig.h" #include "cpython/initconfig.h"
PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *); PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *);
@ -257,7 +253,3 @@ typedef int (*crossinterpdatafunc)(PyObject *, struct _xid *);
PyAPI_FUNC(int) _PyCrossInterpreterData_RegisterClass(PyTypeObject *, crossinterpdatafunc); PyAPI_FUNC(int) _PyCrossInterpreterData_RegisterClass(PyTypeObject *, crossinterpdatafunc);
PyAPI_FUNC(crossinterpdatafunc) _PyCrossInterpreterData_Lookup(PyObject *); PyAPI_FUNC(crossinterpdatafunc) _PyCrossInterpreterData_Lookup(PyObject *);
#ifdef __cplusplus
}
#endif

8
Include/cpython/sysmodule.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key); PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key);
PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *); PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *);
@ -18,7 +14,3 @@ PyAPI_FUNC(int) PySys_Audit(
const char *argFormat, const char *argFormat,
...); ...);
PyAPI_FUNC(int) PySys_AddAuditHook(Py_AuditHookFunction, void*); PyAPI_FUNC(int) PySys_AddAuditHook(Py_AuditHookFunction, void*);
#ifdef __cplusplus
}
#endif

8
Include/cpython/traceback.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
typedef struct _traceback { typedef struct _traceback {
PyObject_HEAD PyObject_HEAD
struct _traceback *tb_next; struct _traceback *tb_next;
@ -16,7 +12,3 @@ typedef struct _traceback {
PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, PyObject *, int, int); PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, PyObject *, int, int);
PyAPI_FUNC(void) _PyTraceback_Add(const char *, const char *, int); PyAPI_FUNC(void) _PyTraceback_Add(const char *, const char *, int);
#ifdef __cplusplus
}
#endif

8
Include/cpython/tupleobject.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
typedef struct { typedef struct {
PyObject_VAR_HEAD PyObject_VAR_HEAD
/* ob_item contains space for 'ob_size' elements. /* ob_item contains space for 'ob_size' elements.
@ -30,7 +26,3 @@ PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
#define PyTuple_SET_ITEM(op, i, v) (_PyTuple_CAST(op)->ob_item[i] = v) #define PyTuple_SET_ITEM(op, i, v) (_PyTuple_CAST(op)->ob_item[i] = v)
PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out); PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);
#ifdef __cplusplus
}
#endif

8
Include/cpython/unicodeobject.h
View File

@ -2,10 +2,6 @@
# error "this header file must not be included directly" # error "this header file must not be included directly"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/* Py_UNICODE was the native Unicode storage format (code unit) used by /* Py_UNICODE was the native Unicode storage format (code unit) used by
Python and represents a single Unicode element in the Unicode type. Python and represents a single Unicode element in the Unicode type.
With PEP 393, Py_UNICODE is deprecated and replaced with a With PEP 393, Py_UNICODE is deprecated and replaced with a
@ -1221,7 +1217,3 @@ PyAPI_FUNC(PyObject*) _PyUnicode_FromId(_Py_Identifier*);
PyAPI_FUNC(int) _PyUnicode_EQ(PyObject *, PyObject *); PyAPI_FUNC(int) _PyUnicode_EQ(PyObject *, PyObject *);
PyAPI_FUNC(Py_ssize_t) _PyUnicode_ScanIdentifier(PyObject *); PyAPI_FUNC(Py_ssize_t) _PyUnicode_ScanIdentifier(PyObject *);
#ifdef __cplusplus
}
#endif

1
Misc/NEWS.d/next/C API/2020-02-08-08-01-35.bpo-39583.qURKSl.rst Normal file
View File

@ -0,0 +1 @@
Remove superfluous "extern C" declarations from ``Include/cpython/*.h``.