greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bpo-38353: Fix compiler warning in internal headers (GH-16573)

Browse Source 
Replace "_PyRuntimeState" with "struct pyruntimestate" to avoid
a warning on typedef re-definition.
This commit is contained in:
Victor Stinner
2019-10-04 02:21:05 +02:00
committed by GitHub
parent c515b573af
commit e982d8b64f
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Include/internal/pycore_ceval.h
View File

@@ -9,10 +9,10 @@ extern "C" {
#endif #endif
/* Forward declarations */ /* Forward declarations */
typedef struct pyruntimestate _PyRuntimeState; struct pyruntimestate;
struct _ceval_runtime_state; struct _ceval_runtime_state;
PyAPI_FUNC(void) _Py_FinishPendingCalls(_PyRuntimeState *runtime); PyAPI_FUNC(void) _Py_FinishPendingCalls(struct pyruntimestate *runtime);
PyAPI_FUNC(void) _PyEval_Initialize(struct _ceval_runtime_state *); PyAPI_FUNC(void) _PyEval_Initialize(struct _ceval_runtime_state *);
PyAPI_FUNC(void) _PyEval_FiniThreads( PyAPI_FUNC(void) _PyEval_FiniThreads(
struct _ceval_runtime_state *ceval); struct _ceval_runtime_state *ceval);
@@ -26,7 +26,7 @@ PyAPI_FUNC(int) _PyEval_AddPendingCall(
PyAPI_FUNC(void) _PyEval_SignalAsyncExc( PyAPI_FUNC(void) _PyEval_SignalAsyncExc(
struct _ceval_runtime_state *ceval); struct _ceval_runtime_state *ceval);
PyAPI_FUNC(void) _PyEval_ReInitThreads( PyAPI_FUNC(void) _PyEval_ReInitThreads(
_PyRuntimeState *runtime); struct pyruntimestate *runtime);
PyAPI_FUNC(void) _PyEval_SetCoroutineOriginTrackingDepth( PyAPI_FUNC(void) _PyEval_SetCoroutineOriginTrackingDepth(
PyThreadState *tstate, PyThreadState *tstate,
int new_depth); int new_depth);

22
Include/internal/pycore_pylifecycle.h
View File

@@ -9,8 +9,8 @@ extern "C" {
#endif #endif
/* Forward declarations */ /* Forward declarations */
typedef struct _PyArgv _PyArgv; struct _PyArgv;
typedef struct pyruntimestate _PyRuntimeState; struct pyruntimestate;
/* True if the main interpreter thread exited due to an unhandled /* True if the main interpreter thread exited due to an unhandled
* KeyboardInterrupt exception, suggesting the user pressed ^C. */ * KeyboardInterrupt exception, suggesting the user pressed ^C. */
@@ -38,14 +38,14 @@ extern PyStatus _PyFaulthandler_Init(int enable);
extern int _PyTraceMalloc_Init(int enable); extern int _PyTraceMalloc_Init(int enable);
extern PyObject * _PyBuiltin_Init(PyThreadState *tstate); extern PyObject * _PyBuiltin_Init(PyThreadState *tstate);
extern PyStatus _PySys_Create( extern PyStatus _PySys_Create(
_PyRuntimeState *runtime, struct pyruntimestate *runtime,
PyThreadState *tstate, PyThreadState *tstate,
PyObject **sysmod_p); PyObject **sysmod_p);
extern PyStatus _PySys_SetPreliminaryStderr(PyObject *sysdict); extern PyStatus _PySys_SetPreliminaryStderr(PyObject *sysdict);
extern PyStatus _PySys_ReadPreinitWarnOptions(PyWideStringList *options); extern PyStatus _PySys_ReadPreinitWarnOptions(PyWideStringList *options);
extern PyStatus _PySys_ReadPreinitXOptions(PyConfig *config); extern PyStatus _PySys_ReadPreinitXOptions(PyConfig *config);
extern int _PySys_InitMain( extern int _PySys_InitMain(
_PyRuntimeState *runtime, struct pyruntimestate *runtime,
PyThreadState *tstate); PyThreadState *tstate);
extern PyStatus _PyImport_Init(PyThreadState *tstate); extern PyStatus _PyImport_Init(PyThreadState *tstate);
extern PyStatus _PyExc_Init(void); extern PyStatus _PyExc_Init(void);
@@ -78,7 +78,7 @@ extern void PyOS_FiniInterrupts(void);
extern void _PyExc_Fini(void); extern void _PyExc_Fini(void);
extern void _PyImport_Fini(void); extern void _PyImport_Fini(void);
extern void _PyImport_Fini2(void); extern void _PyImport_Fini2(void);
extern void _PyGC_Fini(_PyRuntimeState *runtime); extern void _PyGC_Fini(struct pyruntimestate *runtime);
extern void _PyType_Fini(void); extern void _PyType_Fini(void);
extern void _Py_HashRandomization_Fini(void); extern void _Py_HashRandomization_Fini(void);
extern void _PyUnicode_Fini(void); extern void _PyUnicode_Fini(void);
@@ -89,18 +89,18 @@ extern void _PyTraceMalloc_Fini(void);
extern void _PyWarnings_Fini(PyInterpreterState *interp); extern void _PyWarnings_Fini(PyInterpreterState *interp);
extern void _PyGILState_Init( extern void _PyGILState_Init(
_PyRuntimeState *runtime, struct pyruntimestate *runtime,
PyThreadState *tstate); PyThreadState *tstate);
extern void _PyGILState_Fini(_PyRuntimeState *runtime); extern void _PyGILState_Fini(struct pyruntimestate *runtime);
PyAPI_FUNC(void) _PyGC_DumpShutdownStats(_PyRuntimeState *runtime); PyAPI_FUNC(void) _PyGC_DumpShutdownStats(struct pyruntimestate *runtime);
PyAPI_FUNC(PyStatus) _Py_PreInitializeFromPyArgv( PyAPI_FUNC(PyStatus) _Py_PreInitializeFromPyArgv(
const PyPreConfig *src_config, const PyPreConfig *src_config,
const _PyArgv *args); const struct _PyArgv *args);
PyAPI_FUNC(PyStatus) _Py_PreInitializeFromConfig( PyAPI_FUNC(PyStatus) _Py_PreInitializeFromConfig(
const PyConfig *config, const PyConfig *config,
const _PyArgv *args); const struct _PyArgv *args);
PyAPI_FUNC(int) _Py_HandleSystemExit(int *exitcode_p); PyAPI_FUNC(int) _Py_HandleSystemExit(int *exitcode_p);
@@ -111,7 +111,7 @@ PyAPI_FUNC(void) _PyErr_Print(PyThreadState *tstate);
PyAPI_FUNC(void) _PyErr_Display(PyObject *file, PyObject *exception, PyAPI_FUNC(void) _PyErr_Display(PyObject *file, PyObject *exception,
PyObject *value, PyObject *tb); PyObject *value, PyObject *tb);
PyAPI_FUNC(void) _PyThreadState_DeleteCurrent(_PyRuntimeState *runtime); PyAPI_FUNC(void) _PyThreadState_DeleteCurrent(struct pyruntimestate *runtime);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
Include/internal/pycore_traceback.h
View File

@@ -9,7 +9,7 @@ extern "C" {
#endif #endif
/* Forward declaration */ /* Forward declaration */
typedef struct _is PyInterpreterState; struct _is;
/* Write the Python traceback into the file 'fd'. For example: /* Write the Python traceback into the file 'fd'. For example:
@@ -57,7 +57,7 @@ PyAPI_FUNC(void) _Py_DumpTraceback(
PyAPI_FUNC(const char*) _Py_DumpTracebackThreads( PyAPI_FUNC(const char*) _Py_DumpTracebackThreads(
int fd, int fd,
PyInterpreterState *interp, struct _is *interp,
PyThreadState *current_tstate); PyThreadState *current_tstate);
/* Write a Unicode object into the file descriptor fd. Encode the string to /* Write a Unicode object into the file descriptor fd. Encode the string to