Rationalized MS ifdefs
diff --git a/Python/importdl.c b/Python/importdl.c
index b910374..a8015ef 100644
--- a/Python/importdl.c
+++ b/Python/importdl.c
@@ -38,8 +38,8 @@
USE_DL -- Jack's dl for IRIX 4 or GNU dld with emulation for Jack's dl
USE_SHLIB -- SunOS or IRIX 5 (SVR4?) shared libraries
_AIX -- AIX style dynamic linking
- NT -- NT style dynamic linking (using DLLs)
- WIN16_DL -- Windows 16-bit dynamic linking (using DLLs)
+ MS_WIN32 -- Windows NT style dynamic linking (using DLLs)
+ MS_WIN16 -- Windows 16-bit dynamic linking (using DLLs)
_DL_FUNCPTR_DEFINED -- if the typedef dl_funcptr has been defined
USE_MAC_DYNAMIC_LOADING -- Mac CFM shared libraries
SHORT_EXT -- short extension for dynamic module, e.g. ".so"
@@ -76,15 +76,7 @@
#define dlerror() "error in dynamic linking"
#endif
-#ifdef __WIN32__
-#define NT
-#endif
-
-#ifdef MS_WIN16
-#define WIN16_DL
-#endif
-
-#if defined(NT) || defined(WIN16_DL)
+#ifdef MS_WINDOWS /* i.e. MS_WIN32 or MS_WIN16 */
#define DYNAMIC_LINK
#include <windows.h>
typedef FARPROC dl_funcptr;
@@ -382,7 +374,7 @@
}
}
#endif /* _AIX */
-#ifdef NT
+#ifdef MS_WIN32
{
HINSTANCE hDLL;
hDLL = LoadLibrary(pathname);
@@ -424,8 +416,8 @@
}
p = GetProcAddress(hDLL, funcname);
}
-#endif /* NT */
-#ifdef WIN16_DL
+#endif /* MS_WIN32 */
+#ifdef MS_WIN16
{
HINSTANCE hDLL;
hDLL = LoadLibrary(pathname);
@@ -437,7 +429,7 @@
}
p = GetProcAddress(hDLL, funcname);
}
-#endif /* WIN16_DL */
+#endif /* MS_WIN16 */
#ifdef USE_DL
p = dl_loadmod(getprogramname(), pathname, funcname);
#endif /* USE_DL */
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 1da9d9e..7714248 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -44,7 +44,7 @@
#include <signal.h>
#endif
-#ifdef NT
+#ifdef MS_WIN32
#undef BYTE
#undef arglist
#include "windows.h"
@@ -562,7 +562,7 @@
#ifdef macintosh
for (;;);
#endif
-#ifdef NT
+#ifdef MS_WIN32
OutputDebugString("Fatal Python error:");
OutputDebugString(msg);
OutputDebugString("\n");
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 5cfd2d6..1bcb287 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -49,7 +49,7 @@
static object *sysdict;
-#ifdef NT
+#ifdef MS_COREDLL
extern void *PyWin_DLLhModule;
#endif