From a7fbaa43b7dbea55b2a48093f68abf819bc71682 Mon Sep 17 00:00:00 2001 From: "K.Takata" Date: Mon, 26 Dec 2022 14:46:51 +0000 Subject: [PATCH] patch 9.0.1102: complicated use of #ifdef Problem: Complicated use of #ifdef. Solution: Simplify #ifdef use. (Ken Takata, closes #11745) --- src/if_python3.c | 6 ++---- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/if_python3.c b/src/if_python3.c index e0c546a3f..30332e166 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -1167,14 +1167,10 @@ Python3_Init(void) // Catch exit() called in Py_Initialize(). hook_py_exit(); if (setjmp(exit_hook_jump_buf) == 0) -#endif { Py_Initialize(); -#ifdef HOOK_EXIT restore_py_exit(); -#endif } -#ifdef HOOK_EXIT else { // exit() was called in Py_Initialize(). @@ -1182,6 +1178,8 @@ Python3_Init(void) emsg(_(e_critical_error_in_python3_initialization_check_your_installation)); goto fail; } +#else + Py_Initialize(); #endif #if PY_VERSION_HEX < 0x03090000 diff --git a/src/version.c b/src/version.c index d379aa998..429d9ce68 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1102, /**/ 1101, /**/ -- 2.40.0