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

gh-110079: Remove extern "C" { ...} in C code (#110080)

This commit is contained in:
Victor Stinner 2023-09-29 10:56:49 +02:00 committed by GitHub
parent bfd94ab9e9
commit 8b626a47ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 6 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/_scproxy.c
View File

@ -249,16 +249,8 @@ static struct PyModuleDef _scproxy_module = {
.m_slots = _scproxy_slots, .m_slots = _scproxy_slots,
}; };
#ifdef __cplusplus
extern "C" {
#endif
PyMODINIT_FUNC PyMODINIT_FUNC
PyInit__scproxy(void) PyInit__scproxy(void)
{ {
return PyModuleDef_Init(&_scproxy_module); return PyModuleDef_Init(&_scproxy_module);
} }
#ifdef __cplusplus
}
#endif

8
Modules/_stat.c
View File

@ -13,10 +13,6 @@
#include "Python.h" #include "Python.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif /* HAVE_SYS_TYPES_H */ #endif /* HAVE_SYS_TYPES_H */
@ -631,7 +627,3 @@ PyInit__stat(void)
{ {
return PyModuleDef_Init(&statmodule); return PyModuleDef_Init(&statmodule);
} }
#ifdef __cplusplus
}
#endif

8
Modules/main.c
View File

@ -26,10 +26,6 @@
"Type \"help\", \"copyright\", \"credits\" or \"license\" " \ "Type \"help\", \"copyright\", \"credits\" or \"license\" " \
"for more information." "for more information."
#ifdef __cplusplus
extern "C" {
#endif
/* --- pymain_init() ---------------------------------------------- */ /* --- pymain_init() ---------------------------------------------- */
static PyStatus static PyStatus
@ -742,7 +738,3 @@ Py_BytesMain(int argc, char **argv)
.wchar_argv = NULL}; .wchar_argv = NULL};
return pymain_main(&args); return pymain_main(&args);
} }
#ifdef __cplusplus
}
#endif

8
Modules/posixmodule.c
View File

@ -222,10 +222,6 @@
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
PyDoc_STRVAR(posix__doc__, PyDoc_STRVAR(posix__doc__,
"This module provides access to operating system functionality that is\n\ "This module provides access to operating system functionality that is\n\
standardized by the C Standard and the POSIX standard (a thinly\n\ standardized by the C Standard and the POSIX standard (a thinly\n\
@ -17002,7 +16998,3 @@ INITFUNC(void)
{ {
return PyModuleDef_Init(&posixmodule); return PyModuleDef_Init(&posixmodule);
} }
#ifdef __cplusplus
}
#endif

9
Objects/fileobject.c
View File

@ -21,10 +21,6 @@
#define NEWLINE_LF 2 /* \n newline seen */ #define NEWLINE_LF 2 /* \n newline seen */
#define NEWLINE_CRLF 4 /* \r\n newline seen */ #define NEWLINE_CRLF 4 /* \r\n newline seen */
#ifdef __cplusplus
extern "C" {
#endif
/* External C interface */ /* External C interface */
PyObject * PyObject *
@ -539,8 +535,3 @@ _PyFile_Flush(PyObject *file)
Py_DECREF(tmp); Py_DECREF(tmp);
return 0; return 0;
} }
#ifdef __cplusplus
}
#endif

8
Objects/object.c
View File

@ -28,10 +28,6 @@
# error "Py_LIMITED_API macro must not be defined" # error "Py_LIMITED_API macro must not be defined"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/* Defined in tracemalloc.c */ /* Defined in tracemalloc.c */
extern void _PyMem_DumpTraceback(int fd, const void *ptr); extern void _PyMem_DumpTraceback(int fd, const void *ptr);
@ -2808,7 +2804,3 @@ int Py_IsFalse(PyObject *x)
{ {
return Py_Is(x, Py_False); return Py_Is(x, Py_False);
} }
#ifdef __cplusplus
}
#endif

10
Objects/unicodeobject.c
View File

@ -100,11 +100,6 @@ NOTE: In the interpreter's initialization phase, some globals are currently
*/ */
#ifdef __cplusplus
extern "C" {
#endif
// Maximum code point of Unicode 6.0: 0x10ffff (1,114,111). // Maximum code point of Unicode 6.0: 0x10ffff (1,114,111).
// The value must be the same in fileutils.c. // The value must be the same in fileutils.c.
#define MAX_UNICODE 0x10ffff #define MAX_UNICODE 0x10ffff
@ -15397,8 +15392,3 @@ PyInit__string(void)
{ {
return PyModuleDef_Init(&_string_module); return PyModuleDef_Init(&_string_module);
} }
#ifdef __cplusplus
}
#endif

7
Python/dtoa.c
View File

@ -172,10 +172,6 @@ typedef uint64_t ULLong;
#define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);} #define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
typedef union { double d; ULong L[2]; } U; typedef union { double d; ULong L[2]; } U;
#ifdef IEEE_8087 #ifdef IEEE_8087
@ -2813,8 +2809,5 @@ _Py_dg_dtoa(double dd, int mode, int ndigits,
_Py_dg_freedtoa(s0); _Py_dg_freedtoa(s0);
return NULL; return NULL;
} }
#ifdef __cplusplus
}
#endif
#endif // _PY_SHORT_FLOAT_REPR == 1 #endif // _PY_SHORT_FLOAT_REPR == 1

9
Python/errors.c
View File

@ -16,11 +16,6 @@
# include <stdlib.h> // _sys_nerr # include <stdlib.h> // _sys_nerr
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/* Forward declarations */ /* Forward declarations */
static PyObject * static PyObject *
_PyErr_FormatV(PyThreadState *tstate, PyObject *exception, _PyErr_FormatV(PyThreadState *tstate, PyObject *exception,
@ -1918,7 +1913,3 @@ PyErr_ProgramTextObject(PyObject *filename, int lineno)
{ {
return _PyErr_ProgramDecodedTextObject(filename, lineno, NULL); return _PyErr_ProgramDecodedTextObject(filename, lineno, NULL);
} }
#ifdef __cplusplus
}
#endif

8
Python/getargs.c
View File

@ -7,10 +7,6 @@
#include "pycore_pylifecycle.h" // _PyArg_Fini #include "pycore_pylifecycle.h" // _PyArg_Fini
#include "pycore_tuple.h" // _PyTuple_ITEMS() #include "pycore_tuple.h" // _PyTuple_ITEMS()
#ifdef __cplusplus
extern "C" {
#endif
/* Export Stable ABIs (abi only) */ /* Export Stable ABIs (abi only) */
PyAPI_FUNC(int) _PyArg_Parse_SizeT(PyObject *, const char *, ...); PyAPI_FUNC(int) _PyArg_Parse_SizeT(PyObject *, const char *, ...);
PyAPI_FUNC(int) _PyArg_ParseTuple_SizeT(PyObject *, const char *, ...); PyAPI_FUNC(int) _PyArg_ParseTuple_SizeT(PyObject *, const char *, ...);
@ -2867,7 +2863,3 @@ _PyArg_Fini(void)
} }
_PyRuntime.getargs.static_parsers = NULL; _PyRuntime.getargs.static_parsers = NULL;
} }
#ifdef __cplusplus
};
#endif

9
Python/getopt.c
View File

@ -29,10 +29,6 @@
#include <wchar.h> #include <wchar.h>
#include "pycore_getopt.h" #include "pycore_getopt.h"
#ifdef __cplusplus
extern "C" {
#endif
int _PyOS_opterr = 1; /* generate error messages */ int _PyOS_opterr = 1; /* generate error messages */
Py_ssize_t _PyOS_optind = 1; /* index into argv array */ Py_ssize_t _PyOS_optind = 1; /* index into argv array */
const wchar_t *_PyOS_optarg = NULL; /* optional argument */ const wchar_t *_PyOS_optarg = NULL; /* optional argument */
@ -172,8 +168,3 @@ int _PyOS_GetOpt(Py_ssize_t argc, wchar_t * const *argv, int *longindex)
return option; return option;
} }
#ifdef __cplusplus
}
#endif

8
Python/import.c
View File

@ -24,9 +24,6 @@
#ifdef HAVE_FCNTL_H #ifdef HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/*[clinic input] /*[clinic input]
@ -3887,8 +3884,3 @@ PyInit__imp(void)
{ {
return PyModuleDef_Init(&imp_module); return PyModuleDef_Init(&imp_module);
} }
#ifdef __cplusplus
}
#endif

9
Python/pathconfig.c
View File

@ -16,10 +16,6 @@
# include <shlwapi.h> # include <shlwapi.h>
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/* External interface */ /* External interface */
@ -500,8 +496,3 @@ _PyPathConfig_ComputeSysPath0(const PyWideStringList *argv, PyObject **path0_p)
*path0_p = path0_obj; *path0_p = path0_obj;
return 1; return 1;
} }
#ifdef __cplusplus
}
#endif

8
Python/pyhash.c
View File

@ -14,10 +14,6 @@
# include <sys/endian.h> # include <sys/endian.h>
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
_Py_HashSecret_t _Py_HashSecret = {{0}}; _Py_HashSecret_t _Py_HashSecret = {{0}};
#if Py_HASH_ALGORITHM == Py_HASH_EXTERNAL #if Py_HASH_ALGORITHM == Py_HASH_EXTERNAL
@ -503,7 +499,3 @@ pysiphash(const void *src, Py_ssize_t src_sz) {
static PyHash_FuncDef PyHash_Func = {pysiphash, "siphash24", 64, 128}; static PyHash_FuncDef PyHash_Func = {pysiphash, "siphash24", 64, 128};
#endif #endif
#ifdef __cplusplus
}
#endif

9
Python/pylifecycle.c
View File

@ -61,11 +61,6 @@
#define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str)) #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str))
#ifdef __cplusplus
extern "C" {
#endif
/* Forward declarations */ /* Forward declarations */
static PyStatus add_main_module(PyInterpreterState *interp); static PyStatus add_main_module(PyInterpreterState *interp);
static PyStatus init_import_site(void); static PyStatus init_import_site(void);
@ -3139,7 +3134,3 @@ PyOS_setsig(int sig, PyOS_sighandler_t handler)
return oldhandler; return oldhandler;
#endif #endif
} }
#ifdef __cplusplus
}
#endif

9
Python/pystate.c
View File

@ -37,10 +37,6 @@ to avoid the expense of doing their own locking).
# endif # endif
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/****************************************/ /****************************************/
/* helpers for the current thread state */ /* helpers for the current thread state */
@ -2985,8 +2981,3 @@ _PyThreadState_MustExit(PyThreadState *tstate)
} }
return 1; return 1;
} }
#ifdef __cplusplus
}
#endif

9
Python/pythonrun.c
View File

@ -37,11 +37,6 @@
# include "windows.h" # include "windows.h"
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
/* Forward */ /* Forward */
static void flush_io(void); static void flush_io(void);
static PyObject *run_mod(mod_ty, PyObject *, PyObject *, PyObject *, static PyObject *run_mod(mod_ty, PyObject *, PyObject *, PyObject *,
@ -2017,7 +2012,3 @@ PyRun_InteractiveLoop(FILE *f, const char *p)
{ {
return PyRun_InteractiveLoopFlags(f, p, NULL); return PyRun_InteractiveLoopFlags(f, p, NULL);
} }
#ifdef __cplusplus
}
#endif

18
Python/sysmodule.c
View File

@ -2039,11 +2039,6 @@ sys_call_tracing_impl(PyObject *module, PyObject *func, PyObject *funcargs)
return _PyEval_CallTracing(func, funcargs); return _PyEval_CallTracing(func, funcargs);
} }
#ifdef __cplusplus
extern "C" {
#endif
/*[clinic input] /*[clinic input]
sys._debugmallocstats sys._debugmallocstats
@ -2072,10 +2067,6 @@ sys__debugmallocstats_impl(PyObject *module)
extern PyObject *_Py_GetObjects(PyObject *, PyObject *); extern PyObject *_Py_GetObjects(PyObject *, PyObject *);
#endif #endif
#ifdef __cplusplus
}
#endif
/*[clinic input] /*[clinic input]
sys._clear_type_cache sys._clear_type_cache
@ -2297,11 +2288,6 @@ sys__getframemodulename_impl(PyObject *module, int depth)
return Py_NewRef(r); return Py_NewRef(r);
} }
#ifdef __cplusplus
extern "C" {
#endif
static PerfMapState perf_map_state; static PerfMapState perf_map_state;
PyAPI_FUNC(int) PyUnstable_PerfMapState_Init(void) { PyAPI_FUNC(int) PyUnstable_PerfMapState_Init(void) {
@ -2370,10 +2356,6 @@ PyAPI_FUNC(void) PyUnstable_PerfMapState_Fini(void) {
#endif #endif
} }
#ifdef __cplusplus
}
#endif
static PyMethodDef sys_methods[] = { static PyMethodDef sys_methods[] = {
/* Might as well keep this in alphabetic order */ /* Might as well keep this in alphabetic order */