[Python-checkins] python/dist/src/PC getpathp.c,1.26,1.27 pyconfig.h,1.10,1.11

[loewis@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/PC
In directory usw-pr-cvs1:/tmp/cvs-serv9631/PC

Modified Files:
	getpathp.c pyconfig.h 
Log Message:
Patch #569753: Remove support for WIN16. 
Rename all occurrences of MS_WIN32 to MS_WINDOWS.


Index: getpathp.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/getpathp.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** getpathp.c	12 Jan 2002 11:05:09 -0000	1.26
--- getpathp.c	30 Jun 2002 15:26:10 -0000	1.27
***************
*** 58,62 ****
  #include "osdefs.h"
  
! #ifdef MS_WIN32
  #include <windows.h>
  #include <tchar.h>
--- 58,62 ----
  #include "osdefs.h"
  
! #ifdef MS_WINDOWS
  #include <windows.h>
  #include <tchar.h>
***************
*** 183,187 ****
  }
  
! #ifdef MS_WIN32
  
  /* a string loaded from the DLL at startup.*/
--- 183,187 ----
  }
  
! #ifdef MS_WINDOWS
  
  /* a string loaded from the DLL at startup.*/
***************
*** 341,345 ****
  	return retval;
  }
! #endif /* MS_WIN32 */
  
  static void
--- 341,345 ----
  	return retval;
  }
! #endif /* MS_WINDOWS */
  
  static void
***************
*** 350,354 ****
  	char *prog = Py_GetProgramName();
  
! #ifdef MS_WIN32
  #ifdef UNICODE
  	WCHAR wprogpath[MAXPATHLEN+1];
--- 350,354 ----
  	char *prog = Py_GetProgramName();
  
! #ifdef MS_WINDOWS
  #ifdef UNICODE
  	WCHAR wprogpath[MAXPATHLEN+1];
***************
*** 424,428 ****
  	char *envpath = Py_GETENV("PYTHONPATH");
  
! #ifdef MS_WIN32
  	int skiphome, skipdefault;
  	char *machinepath = NULL;
--- 424,428 ----
  	char *envpath = Py_GETENV("PYTHONPATH");
  
! #ifdef MS_WINDOWS
  	int skiphome, skipdefault;
  	char *machinepath = NULL;
***************
*** 447,451 ****
  
  
! #ifdef MS_WIN32
  	skiphome = pythonhome==NULL ? 0 : 1;
  	machinepath = getpythonregpath(HKEY_LOCAL_MACHINE, skiphome);
--- 447,451 ----
  
  
! #ifdef MS_WINDOWS
  	skiphome = pythonhome==NULL ? 0 : 1;
  	machinepath = getpythonregpath(HKEY_LOCAL_MACHINE, skiphome);
***************
*** 483,487 ****
  	bufsz += strlen(PYTHONPATH) + 1;
  	bufsz += strlen(argv0_path) + 1;
! #ifdef MS_WIN32
  	if (userpath)
  		bufsz += strlen(userpath) + 1;
--- 483,487 ----
  	bufsz += strlen(PYTHONPATH) + 1;
  	bufsz += strlen(argv0_path) + 1;
! #ifdef MS_WINDOWS
  	if (userpath)
  		bufsz += strlen(userpath) + 1;
***************
*** 504,513 ****
  			module_search_path = PYTHONPATH;
  		}
! #ifdef MS_WIN32
  		if (machinepath)
  			free(machinepath);
  		if (userpath)
  			free(userpath);
! #endif /* MS_WIN32 */
  		return;
  	}
--- 504,513 ----
  			module_search_path = PYTHONPATH;
  		}
! #ifdef MS_WINDOWS
  		if (machinepath)
  			free(machinepath);
  		if (userpath)
  			free(userpath);
! #endif /* MS_WINDOWS */
  		return;
  	}
***************
*** 518,522 ****
  		*buf++ = DELIM;
  	}
! #ifdef MS_WIN32
  	if (userpath) {
  		strcpy(buf, userpath);
--- 518,522 ----
  		*buf++ = DELIM;
  	}
! #ifdef MS_WINDOWS
  	if (userpath) {
  		strcpy(buf, userpath);
***************
*** 542,546 ****
  		buf = strchr(buf, '\0');
  	}
! #endif /* MS_WIN32 */
  	else {
  		char *p = PYTHONPATH;
--- 542,546 ----
  		buf = strchr(buf, '\0');
  	}
! #endif /* MS_WINDOWS */
  	else {
  		char *p = PYTHONPATH;

Index: pyconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/pyconfig.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pyconfig.h	9 Jun 2002 13:41:36 -0000	1.10
--- pyconfig.h	30 Jun 2002 15:26:10 -0000	1.11
***************
*** 13,18 ****
  
  MS_WIN64 - Code specific to the MS Win64 API
! MS_WIN32 - Code specific to the MS Win32 (and Win64) API
! MS_WIN16 - Code specific to the old 16 bit Windows API.
  MS_WINDOWS - Code specific to Windows, but all versions.
  MS_COREDLL - Code if the Python core is built as a DLL.
--- 13,17 ----
  
  MS_WIN64 - Code specific to the MS Win64 API
! MS_WIN32 - Code specific to the MS Win32 (and Win64) API (obsolete, this covers all supported APIs)
  MS_WINDOWS - Code specific to Windows, but all versions.
  MS_COREDLL - Code if the Python core is built as a DLL.
***************
*** 66,72 ****
  #define MS_WIN32
  #endif
- #ifdef _WIN16
- #define MS_WIN16
- #endif
  #define MS_WINDOWS
  
--- 65,68 ----
***************
*** 452,459 ****
  
  /* 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 */
--- 448,452 ----