[Python-checkins] python/dist/src/Objects fileobject.c,2.163,2.164 unicodeobject.c,2.154,2.155

[loewis@users.sourceforge.net]

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

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


Index: fileobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/fileobject.c,v
retrieving revision 2.163
retrieving revision 2.164
diff -C2 -d -r2.163 -r2.164
*** fileobject.c	13 Jun 2002 20:32:59 -0000	2.163
--- fileobject.c	30 Jun 2002 15:26:09 -0000	2.164
***************
*** 9,13 ****
  #endif /* DONT_HAVE_SYS_TYPES_H */
  
! #ifdef MS_WIN32
  #define fileno _fileno
  /* can simulate truncate with Win32 API functions; see file_truncate */
--- 9,13 ----
  #endif /* DONT_HAVE_SYS_TYPES_H */
  
! #ifdef MS_WINDOWS
  #define fileno _fileno
  /* can simulate truncate with Win32 API functions; see file_truncate */
***************
*** 481,485 ****
  		goto onioerror;
  
! #ifdef MS_WIN32
  	/* MS _chsize doesn't work if newsize doesn't fit in 32 bits,
  	   so don't even try using it. */
--- 481,485 ----
  		goto onioerror;
  
! #ifdef MS_WINDOWS
  	/* MS _chsize doesn't work if newsize doesn't fit in 32 bits,
  	   so don't even try using it. */
***************
*** 543,547 ****
  	Py_END_ALLOW_THREADS
  	if (ret != 0) goto onioerror;
! #endif /* !MS_WIN32 */
  
  	Py_INCREF(Py_None);
--- 543,547 ----
  	Py_END_ALLOW_THREADS
  	if (ret != 0) goto onioerror;
! #endif /* !MS_WINDOWS */
  
  	Py_INCREF(Py_None);

Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.154
retrieving revision 2.155
diff -C2 -d -r2.154 -r2.155
*** unicodeobject.c	13 Jun 2002 21:25:17 -0000	2.154
--- unicodeobject.c	30 Jun 2002 15:26:10 -0000	2.155
***************
*** 42,46 ****
  #include "ucnhash.h"
  
! #ifdef MS_WIN32
  #include <windows.h>
  #endif
--- 42,46 ----
  #include "ucnhash.h"
  
! #ifdef MS_WINDOWS
  #include <windows.h>
  #endif
***************
*** 2244,2248 ****
  }
  
! #if defined(MS_WIN32) && defined(HAVE_USABLE_WCHAR_T)
  
  /* --- MBCS codecs for Windows -------------------------------------------- */
--- 2244,2248 ----
  }
  
! #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
  
  /* --- MBCS codecs for Windows -------------------------------------------- */
***************
*** 2306,2310 ****
  }
  
! #endif /* MS_WIN32 */
  
  /* --- Character Mapping Codec -------------------------------------------- */
--- 2306,2310 ----
  }
  
! #endif /* MS_WINDOWS */
  
  /* --- Character Mapping Codec -------------------------------------------- */