More changes for NT, Guido style

gvanrossum · gvanrossum · commit eaf9b6cd7b18 · 1996-08-22T00:06:59.000Z
diff --git a/PC/_tkinter.def b/PC/_tkinter.def
@@ -0,0 +1,2 @@
+EXPORTS
+	init_tkinter
diff --git a/PC/config.c b/PC/config.c
@@ -33,7 +33,6 @@ extern void initarray();
 extern void initaudioop();
 extern void initbinascii();
 extern void initcmath();
-extern void initenvironment();
 extern void initerrno();
 extern void initimageop();
 extern void initmath();
@@ -65,7 +64,6 @@ struct _inittab inittab[] = {
 #endif
         {"binascii", initbinascii},
         {"cmath", initcmath},
-        {"environment", initenvironment},
         {"errno", initerrno},
         {"imageop", initimageop},
         {"math", initmath},
diff --git a/PC/config.h b/PC/config.h
@@ -44,6 +44,10 @@ compiler specific".  Therefore, these should be very rare.
 #define PREFIX ""
 #define EXEC_PREFIX ""
 
+#ifndef WIN32_PATCH_LEVEL
+#define WIN32_PATCH_LEVEL "14"
+#endif
+
 /* Microsoft C defines _MSC_VER */
 
 #if defined(_MSC_VER) && _MSC_VER > 850
@@ -52,12 +56,16 @@ compiler specific".  Therefore, these should be very rare.
 #define MS_WIN32
 #define MS_WINDOWS
 
-#ifdef MS_COREDLL	/* Python core is in a DLL */
+/* For NT the Python core is in a DLL by default.  Test the
+standard macro MS_COREDLL to find out.  If you have an exception
+you must define MS_NO_COREDLL (do not test this macro) */
+#ifndef MS_NO_COREDLL
+#define MS_COREDLL	/* Python core is in a DLL */
 #define main Py_Main
 #ifndef USE_DL_EXPORT
 #define USE_DL_IMPORT
 #endif /* !USE_DL_EXPORT */
-#endif /* MS_COREDLL */
+#endif /* !MS_NO_COREDLL */
 
 #ifdef _M_IX86
 #define COMPILER "[MSC 32 bit (Intel)]"
@@ -283,6 +291,12 @@ typedef int pid_t;
 /* Define this if your time.h defines altzone */
 /* #define HAVE_ALTZONE */
 
+/* Define if you have the putenv function.  */
+#ifdef MS_WIN32
+/* Does this exist on Win16? */
+#define HAVE_PUTENV
+#endif
+
 /* Define if your compiler supports function prototypes */
 #define HAVE_PROTOTYPES
 
diff --git a/PC/getpath_nt.c b/PC/getpath_nt.c
@@ -2,10 +2,6 @@
 #include "osdefs.h"
 #include <windows.h>
 
-#ifndef WIN32_PATCH_LEVEL
-#define WIN32_PATCH_LEVEL "000"
-#endif
-
 /* PREFIX and EXEC_PREFIX are meaningless on Windows */
 
 #ifndef PREFIX
diff --git a/PC/import_nt.c b/PC/import_nt.c
@@ -1,6 +1,6 @@
 /********************************************************************
 
- importnt.c 
+ import_nt.c 
 
   Win32 specific import code.
 
@@ -12,10 +12,6 @@
 #include "import.h"
 #include "importdl.h"
 
-#ifndef WIN32_PATCH_LEVEL
-#define WIN32_PATCH_LEVEL "000"
-#endif
-
 extern BOOL PyWin_IsWin32s();
 
 FILE *PyWin_FindRegisteredModule( const char *moduleName, struct filedescr **ppFileDesc, char *pathBuf, int pathLen)
diff --git a/PC/main_nt.c b/PC/main_nt.c
@@ -24,9 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* Python interpreter main program */
 
-#define HAVE_CONFIG_H
-#include "Python.h"
-#undef main
+extern int Py_Main(int, char **);
 
 int
 main(argc, argv)
diff --git a/PC/python.def b/PC/python.def
@@ -231,3 +231,8 @@ EXPORTS
 	PyTuple_GetItem
 	PyTuple_SetItem
 	PyTuple_GetSlice
+	Py_Main
+	PySlice_Type DATA
+	PySlice_New
+	PySlice_GetIndices
+	Py_GetProgramName
diff --git a/PC/vc40.mak b/PC/vc40.mak
diff --git a/PC/vc40.mdp b/PC/vc40.mdp
diff --git a/PC/vc40.ncb b/PC/vc40.ncb
