summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-12-26 14:46:51 +0000
committerBram Moolenaar <Bram@vim.org>2022-12-26 14:46:51 +0000
commita7fbaa43b7dbea55b2a48093f68abf819bc71682 (patch)
tree68423dbac3d0add21b987768d9ff1500a250f334
parentb536540ab3c13db629432c411e92c05c4a3808ba (diff)
downloadvim-git-a7fbaa43b7dbea55b2a48093f68abf819bc71682.tar.gz
patch 9.0.1102: complicated use of #ifdefv9.0.1102
Problem: Complicated use of #ifdef. Solution: Simplify #ifdef use. (Ken Takata, closes #11745)
-rw-r--r--src/if_python3.c6
-rw-r--r--src/version.c2
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
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1102,
+/**/
1101,
/**/
1100,