summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1996-06-28 20:15:15 (GMT)
committerGuido van Rossum <guido@python.org>1996-06-28 20:15:15 (GMT)
commit6f489d989d947169e70a8668cd265780a0a13d5e (patch)
treeee5f704079aea1d11a38a2b15561f9ac4e000ae3 /Python
parent919c5762547aec03e63c923a584a91b9b154b6ac (diff)
downloadcpython-6f489d989d947169e70a8668cd265780a0a13d5e.zip
cpython-6f489d989d947169e70a8668cd265780a0a13d5e.tar.gz
cpython-6f489d989d947169e70a8668cd265780a0a13d5e.tar.bz2
Slightly different Windows ifdefs
Diffstat (limited to 'Python')
-rw-r--r--Python/import.c5
-rw-r--r--Python/sysmodule.c2
2 files changed, 3 insertions, 4 deletions
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 @@ find_module(name, path, buf, buflen, p_fp)
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 @@ find_module(name, path, buf, buflen, p_fp)
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 @@ initsys()
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));