Slightly different Windows ifdefs
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 85a2557..25665c6 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -34,7 +34,7 @@
#include <sys/types.h>
-#ifdef _MSC_VER
+#ifdef MS_WINDOWS
#include <winsock.h>
#else
#include "myselect.h" /* Also includes mytime.h */
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index e76e12c..ffe6b44 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -82,7 +82,7 @@
#include "mytime.h"
#include <signal.h>
-#ifndef _MSC_VER
+#ifndef MS_WINDOWS
#include <netdb.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -487,7 +487,7 @@
if (!PyArg_GetInt(args, &block))
return NULL;
Py_BEGIN_ALLOW_THREADS
-#ifndef _MSC_VER
+#ifndef MS_WINDOWS
delay_flag = fcntl (s->sock_fd, F_GETFL, 0);
if (block)
delay_flag &= (~O_NDELAY);
@@ -1108,7 +1108,7 @@
BUILD_FUNC_DEF_2(PySocket_socket,PyObject *,self, PyObject *,args)
{
PySocketSockObject *s;
-#ifdef _MSC_VER
+#ifdef MS_WINDOWS
SOCKET fd;
#else
int fd;
@@ -1119,7 +1119,7 @@
Py_BEGIN_ALLOW_THREADS
fd = socket(family, type, proto);
Py_END_ALLOW_THREADS
-#ifdef _MSC_VER
+#ifdef MS_WINDOWS
if (fd == INVALID_SOCKET)
#else
if (fd < 0)
diff --git a/Python/import.c b/Python/import.c
index 12a2c30..a46576d 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -415,7 +415,7 @@
struct filedescr *fdp;
FILE *fp = NULL;
-#ifdef NT
+#ifdef PYTHONWIN
if ((fp=PyWin_FindRegisteredModule(name, &fdp, buf, buflen))!=NULL) {
*p_fp = fp;
return fdp;
@@ -463,12 +463,11 @@
buf[len++] = ch;
}
else /* Not in dos_8x3, use the full name */
-#else
+#endif
{
strcpy(buf+len, name);
len += namelen;
}
-#endif
for (fdp = import_filetab; fdp->suffix != NULL; fdp++) {
strcpy(buf+len, fdp->suffix);
if (verbose > 1)
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 615a18a..8937c85 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -269,7 +269,7 @@
dictinsert(sysdict, "builtin_module_names",
v = list_builtin_module_names());
XDECREF(v);
-#ifdef NT
+#ifdef PYTHONWIN
dictinsert(sysdict, "dllhandle", v = newintobject((int)PyWin_DLLhModule));
XDECREF(v);
dictinsert(sysdict, "winver", v = newstringobject(WIN32_PATCH_LEVEL));