patch 8.0.1236: Mac features are confusing
Problem: Mac features are confusing.
Solution: Make feature names more consistent, add "osxdarwin". Rename
feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
diff --git a/src/if_python3.c b/src/if_python3.c
index ac370fd..7aa5f03 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -74,10 +74,6 @@
#include <Python.h>
-#if defined(MACOS) && !defined(MACOS_X_UNIX)
-# include "macglue.h"
-# include <CodeFragments.h>
-#endif
#undef main /* Defined in python.h - aargh */
#undef HAVE_FCNTL_H /* Clash with os_win32.h */
@@ -871,11 +867,8 @@
PyImport_AppendInittab("vim", Py3Init_vim);
-#if !defined(MACOS) || defined(MACOS_X_UNIX)
Py_Initialize();
-#else
- PyMac_Initialize();
-#endif
+
/* Initialise threads, and below save the state using
* PyEval_SaveThread. Without the call to PyEval_SaveThread, thread
* specific state (such as the system trace hook), will be lost
@@ -929,9 +922,6 @@
static void
DoPyCommand(const char *cmd, rangeinitializer init_range, runner run, void *arg)
{
-#if defined(MACOS) && !defined(MACOS_X_UNIX)
- GrafPtr oldPort;
-#endif
#if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
char *saved_locale;
#endif
@@ -942,12 +932,6 @@
if (python_end_called)
goto theend;
-#if defined(MACOS) && !defined(MACOS_X_UNIX)
- GetPort(&oldPort);
- /* Check if the Python library is available */
- if ((Ptr)PyMac_Initialize == (Ptr)kUnresolvedCFragSymbolAddress)
- goto theend;
-#endif
if (Python3_Init())
goto theend;
@@ -992,9 +976,6 @@
Python_Lock_Vim(); /* enter vim */
PythonIO_Flush();
-#if defined(MACOS) && !defined(MACOS_X_UNIX)
- SetPort(oldPort);
-#endif
theend:
return; /* keeps lint happy */