Commits

Anthony Tuininga  committed cf58dcd

Use the macro MS_WINDOWS rather than WIN32 so that 64-bit Windows compilation
is supported.

  • Participants
  • Parent commits b8c2446

Comments (0)

Files changed (3)

File source/bases/Common.c

     char temp[MAXPATHLEN + 12], *ptr;
     const char *tempStr = NULL;
     PyObject *encodedObj;
-#ifndef WIN32
+#ifndef MS_WINDOWS
     char linkData[MAXPATHLEN + 1];
     struct stat statData;
     size_t linkSize, i;
     if (!g_FileName)
         return FatalError("cannot create string for file name");
 
-#ifndef WIN32
+#ifndef MS_WINDOWS
     for (i = 0; i < 25; i++) {
         if (cxString_ToString(g_FileName, &encodedObj, &fileName) < 0)
             return -1;

File source/bases/Console.c

 //-----------------------------------------------------------------------------
 
 #include <Python.h>
-#ifdef __WIN32__
+#ifdef MS_WINDOWS
 #include <windows.h>
 #endif
 

File source/util.c

 
 #include <Python.h>
 
-#ifdef WIN32
+#ifdef MS_WINDOWS
 #include <windows.h>
 #include <imagehlp.h>
 
 //-----------------------------------------------------------------------------
 // Globals
 //-----------------------------------------------------------------------------
-#ifdef WIN32
+#ifdef MS_WINDOWS
 static PyObject *g_BindErrorException = NULL;
 static PyObject *g_ImageNames = NULL;
 #endif
 #endif
 
 
-#ifdef WIN32
+#ifdef MS_WINDOWS
 //-----------------------------------------------------------------------------
 // BindStatusRoutine()
 //   Called by BindImageEx() at various points. This is used to determine the
 //-----------------------------------------------------------------------------
 static PyMethodDef g_ModuleMethods[] = {
     { "SetOptimizeFlag", ExtSetOptimizeFlag, METH_VARARGS },
-#ifdef WIN32
+#ifdef MS_WINDOWS
     { "BeginUpdateResource", ExtBeginUpdateResource, METH_VARARGS },
     { "UpdateResource", ExtUpdateResource, METH_VARARGS },
     { "EndUpdateResource", ExtEndUpdateResource, METH_VARARGS },
 #endif
     if (!module)
         return NULL;
-#ifdef WIN32
+#ifdef MS_WINDOWS
     g_BindErrorException = PyErr_NewException("cx_Freeze.util.BindError",
             NULL, NULL);
     if (!g_BindErrorException)