[Python-checkins] CVS: python/dist/src/PC WinMain.c,1.6,1.6.8.1 config.h,1.51,1.51.2.1

2001年7月07日 15:55:32 -0700

Update of /cvsroot/python/python/dist/src/PC
In directory usw-pr-cvs1:/tmp/cvs-serv24450/mergedescr/dist/src/PC
Modified Files:
 Tag: descr-branch
	WinMain.c config.h 
Log Message:
Merge of trunk tag date2001-07-06 into descr-branch.
Index: WinMain.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/WinMain.c,v
retrieving revision 1.6
retrieving revision 1.6.8.1
diff -C2 -r1.6 -r1.6.8.1
*** WinMain.c	2000年07月22日 23:59:33	1.6
--- WinMain.c	2001年07月07日 22:55:30	1.6.8.1
***************
*** 1,5 ****
 /* Minimal main program -- everything is loaded from the library. */

! #define WINDOWS_LEAN_AND_MEAN
 #include <windows.h>

--- 1,5 ----
 /* Minimal main program -- everything is loaded from the library. */

! #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

Index: config.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/config.h,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -C2 -r1.51 -r1.51.2.1
*** config.h	2001年04月21日 03:20:47	1.51
--- config.h	2001年07月07日 22:55:30	1.51.2.1
***************
*** 37,40 ****
--- 37,41 ----
 #include <io.h>
 #define HAVE_LIMITS_H
+ #define HAVE_SYS_UTIME_H
 #define HAVE_HYPOT
 #define DONT_HAVE_SIG_ALARM
***************
*** 178,181 ****
--- 179,186 ----

 #undef HAVE_HYPOT
+ #undef HAVE_SYS_UTIME_H
+ #define HAVE_UTIME_H
+ #define HAVE_DIRENT_H
+ #define HAVE_CLOCK

 #else /* !_WIN32 */
***************
*** 340,343 ****
--- 345,349 ----
 #endif

+ #define SIZEOF_SHORT 2
 #define SIZEOF_INT 4
 #define SIZEOF_LONG 4
***************
*** 479,482 ****
--- 485,504 ----
 /* #define WITH_READLINE 1 */

+ /* Define if you want to have a Unicode type. */
+ #define Py_USING_UNICODE
+ 
+ /* Define as the integral type used for Unicode representation. */
+ #define PY_UNICODE_TYPE unsigned short
+ 
+ /* Define as the size of the unicode type. */
+ #define Py_UNICODE_SIZE SIZEOF_SHORT
+ 
+ /* Define if you have a useable wchar_t type defined in wchar.h; useable
+ means wchar_t must be 16-bit unsigned type. (see
+ Include/unicodeobject.h). */
+ #if Py_UNICODE_SIZE == 2
+ #define HAVE_USABLE_WCHAR_T
+ #endif
+ 
 /* Define if you want cycle garbage collection */
 #define WITH_CYCLE_GC 1
***************
*** 594,598 ****

 /* Define if you have the <sys/utime.h> header file. */
! #define HAVE_SYS_UTIME_H 1

 /* Define if you have the <sys/utsname.h> header file. */
--- 616,620 ----

 /* Define if you have the <sys/utime.h> header file. */
! /* #define HAVE_SYS_UTIME_H 1 */

 /* Define if you have the <sys/utsname.h> header file. */