From 8b626a47bafdb2d1ebb1321e50ffa5d6c721bf3a Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 29 Sep 2023 10:56:49 +0200 Subject: [PATCH] gh-110079: Remove extern "C" { ...} in C code (#110080) --- Modules/_scproxy.c | 8 -------- Modules/_stat.c | 8 -------- Modules/main.c | 8 -------- Modules/posixmodule.c | 8 -------- Objects/fileobject.c | 9 --------- Objects/object.c | 8 -------- Objects/unicodeobject.c | 10 ---------- Python/dtoa.c | 7 ------- Python/errors.c | 9 --------- Python/getargs.c | 8 -------- Python/getopt.c | 9 --------- Python/import.c | 8 -------- Python/pathconfig.c | 9 --------- Python/pyhash.c | 8 -------- Python/pylifecycle.c | 9 --------- Python/pystate.c | 21 ++++++--------------- Python/pythonrun.c | 9 --------- Python/sysmodule.c | 18 ------------------ 18 files changed, 6 insertions(+), 168 deletions(-) diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c index 0df0324df55..6cc09088bdc 100644 --- a/Modules/_scproxy.c +++ b/Modules/_scproxy.c @@ -249,16 +249,8 @@ static struct PyModuleDef _scproxy_module = { .m_slots = _scproxy_slots, }; -#ifdef __cplusplus -extern "C" { -#endif - PyMODINIT_FUNC PyInit__scproxy(void) { return PyModuleDef_Init(&_scproxy_module); } - -#ifdef __cplusplus -} -#endif diff --git a/Modules/_stat.c b/Modules/_stat.c index 6cea26175de..3fd951b6fc1 100644 --- a/Modules/_stat.c +++ b/Modules/_stat.c @@ -13,10 +13,6 @@ #include "Python.h" -#ifdef __cplusplus -extern "C" { -#endif - #ifdef HAVE_SYS_TYPES_H #include #endif /* HAVE_SYS_TYPES_H */ @@ -631,7 +627,3 @@ PyInit__stat(void) { return PyModuleDef_Init(&statmodule); } - -#ifdef __cplusplus -} -#endif diff --git a/Modules/main.c b/Modules/main.c index 7f88c972074..05bedff0506 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -26,10 +26,6 @@ "Type \"help\", \"copyright\", \"credits\" or \"license\" " \ "for more information." -#ifdef __cplusplus -extern "C" { -#endif - /* --- pymain_init() ---------------------------------------------- */ static PyStatus @@ -742,7 +738,3 @@ Py_BytesMain(int argc, char **argv) .wchar_argv = NULL}; return pymain_main(&args); } - -#ifdef __cplusplus -} -#endif diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index abf449e2549..d7d3e365d2c 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -222,10 +222,6 @@ #endif -#ifdef __cplusplus -extern "C" { -#endif - PyDoc_STRVAR(posix__doc__, "This module provides access to operating system functionality that is\n\ standardized by the C Standard and the POSIX standard (a thinly\n\ @@ -17002,7 +16998,3 @@ INITFUNC(void) { return PyModuleDef_Init(&posixmodule); } - -#ifdef __cplusplus -} -#endif diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 0cf2b47c3b3..066172baf9f 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -21,10 +21,6 @@ #define NEWLINE_LF 2 /* \n newline seen */ #define NEWLINE_CRLF 4 /* \r\n newline seen */ -#ifdef __cplusplus -extern "C" { -#endif - /* External C interface */ PyObject * @@ -539,8 +535,3 @@ _PyFile_Flush(PyObject *file) Py_DECREF(tmp); return 0; } - - -#ifdef __cplusplus -} -#endif diff --git a/Objects/object.c b/Objects/object.c index 15c2bf65de6..3ed272afdce 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -28,10 +28,6 @@ # error "Py_LIMITED_API macro must not be defined" #endif -#ifdef __cplusplus -extern "C" { -#endif - /* Defined in tracemalloc.c */ extern void _PyMem_DumpTraceback(int fd, const void *ptr); @@ -2808,7 +2804,3 @@ int Py_IsFalse(PyObject *x) { return Py_Is(x, Py_False); } - -#ifdef __cplusplus -} -#endif diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index aca28e4842d..49981a1f881 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -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). // The value must be the same in fileutils.c. #define MAX_UNICODE 0x10ffff @@ -15397,8 +15392,3 @@ PyInit__string(void) { return PyModuleDef_Init(&_string_module); } - - -#ifdef __cplusplus -} -#endif diff --git a/Python/dtoa.c b/Python/dtoa.c index c5e343b82f7..5dfc0e179cb 100644 --- a/Python/dtoa.c +++ b/Python/dtoa.c @@ -172,10 +172,6 @@ typedef uint64_t ULLong; #define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);} #endif -#ifdef __cplusplus -extern "C" { -#endif - typedef union { double d; ULong L[2]; } U; #ifdef IEEE_8087 @@ -2813,8 +2809,5 @@ _Py_dg_dtoa(double dd, int mode, int ndigits, _Py_dg_freedtoa(s0); return NULL; } -#ifdef __cplusplus -} -#endif #endif // _PY_SHORT_FLOAT_REPR == 1 diff --git a/Python/errors.c b/Python/errors.c index b05b3ef1dda..15af39b10dc 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -16,11 +16,6 @@ # include // _sys_nerr #endif - -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ static PyObject * _PyErr_FormatV(PyThreadState *tstate, PyObject *exception, @@ -1918,7 +1913,3 @@ PyErr_ProgramTextObject(PyObject *filename, int lineno) { return _PyErr_ProgramDecodedTextObject(filename, lineno, NULL); } - -#ifdef __cplusplus -} -#endif diff --git a/Python/getargs.c b/Python/getargs.c index cbfe5611111..d590e2e1533 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -7,10 +7,6 @@ #include "pycore_pylifecycle.h" // _PyArg_Fini #include "pycore_tuple.h" // _PyTuple_ITEMS() -#ifdef __cplusplus -extern "C" { -#endif - /* Export Stable ABIs (abi only) */ PyAPI_FUNC(int) _PyArg_Parse_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; } - -#ifdef __cplusplus -}; -#endif diff --git a/Python/getopt.c b/Python/getopt.c index 4135bf1446e..f64c89fa227 100644 --- a/Python/getopt.c +++ b/Python/getopt.c @@ -29,10 +29,6 @@ #include #include "pycore_getopt.h" -#ifdef __cplusplus -extern "C" { -#endif - int _PyOS_opterr = 1; /* generate error messages */ Py_ssize_t _PyOS_optind = 1; /* index into argv array */ 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; } - -#ifdef __cplusplus -} -#endif - diff --git a/Python/import.c b/Python/import.c index 5a06cb367e8..5636968ed9e 100644 --- a/Python/import.c +++ b/Python/import.c @@ -24,9 +24,6 @@ #ifdef HAVE_FCNTL_H #include #endif -#ifdef __cplusplus -extern "C" { -#endif /*[clinic input] @@ -3887,8 +3884,3 @@ PyInit__imp(void) { return PyModuleDef_Init(&imp_module); } - - -#ifdef __cplusplus -} -#endif diff --git a/Python/pathconfig.c b/Python/pathconfig.c index 0ac64ec8110..50c60093cd4 100644 --- a/Python/pathconfig.c +++ b/Python/pathconfig.c @@ -16,10 +16,6 @@ # include #endif -#ifdef __cplusplus -extern "C" { -#endif - /* External interface */ @@ -500,8 +496,3 @@ _PyPathConfig_ComputeSysPath0(const PyWideStringList *argv, PyObject **path0_p) *path0_p = path0_obj; return 1; } - - -#ifdef __cplusplus -} -#endif diff --git a/Python/pyhash.c b/Python/pyhash.c index b2bdab5099d..f9060b8003a 100644 --- a/Python/pyhash.c +++ b/Python/pyhash.c @@ -14,10 +14,6 @@ # include #endif -#ifdef __cplusplus -extern "C" { -#endif - _Py_HashSecret_t _Py_HashSecret = {{0}}; #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}; #endif - -#ifdef __cplusplus -} -#endif diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index aec8da10249..23f66ec3601 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -61,11 +61,6 @@ #define PUTS(fd, str) (void)_Py_write_noraise(fd, str, (int)strlen(str)) -#ifdef __cplusplus -extern "C" { -#endif - - /* Forward declarations */ static PyStatus add_main_module(PyInterpreterState *interp); static PyStatus init_import_site(void); @@ -3139,7 +3134,3 @@ PyOS_setsig(int sig, PyOS_sighandler_t handler) return oldhandler; #endif } - -#ifdef __cplusplus -} -#endif diff --git a/Python/pystate.c b/Python/pystate.c index 570b5242600..01aa2552e56 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -29,16 +29,12 @@ to avoid the expense of doing their own locking). -------------------------------------------------------------------------- */ #ifdef HAVE_DLOPEN -#ifdef HAVE_DLFCN_H -#include -#endif -#if !HAVE_DECL_RTLD_LAZY -#define RTLD_LAZY 1 -#endif -#endif - -#ifdef __cplusplus -extern "C" { +# ifdef HAVE_DLFCN_H +# include +# endif +# if !HAVE_DECL_RTLD_LAZY +# define RTLD_LAZY 1 +# endif #endif @@ -2985,8 +2981,3 @@ _PyThreadState_MustExit(PyThreadState *tstate) } return 1; } - - -#ifdef __cplusplus -} -#endif diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 81ab78e95ab..1b282aa870b 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -37,11 +37,6 @@ # include "windows.h" #endif - -#ifdef __cplusplus -extern "C" { -#endif - /* Forward */ static void flush_io(void); 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); } - -#ifdef __cplusplus -} -#endif diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 9c1ee0215d7..7ba7be10aac 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -2039,11 +2039,6 @@ sys_call_tracing_impl(PyObject *module, PyObject *func, PyObject *funcargs) return _PyEval_CallTracing(func, funcargs); } - -#ifdef __cplusplus -extern "C" { -#endif - /*[clinic input] sys._debugmallocstats @@ -2072,10 +2067,6 @@ sys__debugmallocstats_impl(PyObject *module) extern PyObject *_Py_GetObjects(PyObject *, PyObject *); #endif -#ifdef __cplusplus -} -#endif - /*[clinic input] sys._clear_type_cache @@ -2297,11 +2288,6 @@ sys__getframemodulename_impl(PyObject *module, int depth) return Py_NewRef(r); } - -#ifdef __cplusplus -extern "C" { -#endif - static PerfMapState perf_map_state; PyAPI_FUNC(int) PyUnstable_PerfMapState_Init(void) { @@ -2370,10 +2356,6 @@ PyAPI_FUNC(void) PyUnstable_PerfMapState_Fini(void) { #endif } -#ifdef __cplusplus -} -#endif - static PyMethodDef sys_methods[] = { /* Might as well keep this in alphabetic order */