Commit cfc8831
authored
Define _Py_NO_RETURN for Microsoft C compiler (pythonGH-8606)
1 parent fc96437 commit cfc8831
3 files changed
Lines changed: 8 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -97,13 +97,15 @@ PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject *, PyObject *, PyObject *); | |||
| 97 | 97 | (defined(__GNUC_MAJOR__) && \ | |
| 98 | 98 | ((__GNUC_MAJOR__ >= 3) || \ | |
| 99 | 99 | (__GNUC_MAJOR__ == 2) && (__GNUC_MINOR__ >= 5))) | |
| 100 | - #define _Py_NO_RETURN __attribute__((__noreturn__)) | ||
| 100 | + # define _Py_NO_RETURN __attribute__((__noreturn__)) | ||
| 101 | + #elif defined(_MSC_VER) | ||
| 102 | + # define _Py_NO_RETURN __declspec(noreturn) | ||
| 101 | 103 | #else | |
| 102 | - #define _Py_NO_RETURN | ||
| 104 | + # define _Py_NO_RETURN | ||
| 103 | 105 | #endif | |
| 104 | 106 | ||
| 105 | 107 | /* Defined in Python/pylifecycle.c */ | |
| 106 | - PyAPI_FUNC(void) Py_FatalError(const char *message) _Py_NO_RETURN; | ||
| 108 | + PyAPI_FUNC(void) _Py_NO_RETURN Py_FatalError(const char *message); | ||
| 107 | 109 | ||
| 108 | 110 | #if defined(Py_DEBUG) || defined(Py_LIMITED_API) | |
| 109 | 111 | #define _PyErr_OCCURRED() PyErr_Occurred() | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -86,7 +86,7 @@ PyAPI_FUNC(void) Py_InitializeEx(int); | |||
| 86 | 86 | #ifndef Py_LIMITED_API | |
| 87 | 87 | PyAPI_FUNC(_PyInitError) _Py_InitializeFromConfig( | |
| 88 | 88 | const _PyCoreConfig *config); | |
| 89 | - PyAPI_FUNC(void) _Py_FatalInitError(_PyInitError err) _Py_NO_RETURN; | ||
| 89 | + PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalInitError(_PyInitError err); | ||
| 90 | 90 | #endif | |
| 91 | 91 | PyAPI_FUNC(void) Py_Finalize(void); | |
| 92 | 92 | PyAPI_FUNC(int) Py_FinalizeEx(void); | |
@@ -105,7 +105,7 @@ PyAPI_FUNC(void) _Py_PyAtExit(void (*func)(PyObject *), PyObject *); | |||
| 105 | 105 | #endif | |
| 106 | 106 | PyAPI_FUNC(int) Py_AtExit(void (*func)(void)); | |
| 107 | 107 | ||
| 108 | - PyAPI_FUNC(void) Py_Exit(int) _Py_NO_RETURN; | ||
| 108 | + PyAPI_FUNC(void) _Py_NO_RETURN Py_Exit(int); | ||
| 109 | 109 | ||
| 110 | 110 | /* Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. */ | |
| 111 | 111 | #ifndef Py_LIMITED_API | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2212,7 +2212,7 @@ call_ll_exitfuncs(void) | |||
| 2212 | 2212 | fflush(stderr); | |
| 2213 | 2213 | } | |
| 2214 | 2214 | ||
| 2215 | - void | ||
| 2215 | + void _Py_NO_RETURN | ||
| 2216 | 2216 | Py_Exit(int sts) | |
| 2217 | 2217 | { | |
| 2218 | 2218 | if (Py_FinalizeEx() < 0) { | |
0 commit comments