[Python-checkins] r73162 - in python/branches/py3k: Modules/timemodule.c PC/pyconfig.h

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Wed Jun  3 07:19:18 2009
New Revision: 73162

Log:
Issue #6183: Disables wcsftime on VC6.

Modified:
   python/branches/py3k/Modules/timemodule.c
   python/branches/py3k/PC/pyconfig.h

Modified: python/branches/py3k/Modules/timemodule.c
==============================================================================
--- python/branches/py3k/Modules/timemodule.c	(original)
+++ python/branches/py3k/Modules/timemodule.c	Wed Jun  3 07:19:18 2009
@@ -540,7 +540,7 @@
 	fmt = PyBytes_AS_STRING(format);
 #endif
 
-#ifdef MS_WINDOWS
+#if defined(MS_WINDOWS) && defined(HAVE_WCSFTIME)
 	/* check that the format string contains only valid directives */
 	for(outbuf = wcschr(fmt, L'%');
 		outbuf != NULL;

Modified: python/branches/py3k/PC/pyconfig.h
==============================================================================
--- python/branches/py3k/PC/pyconfig.h	(original)
+++ python/branches/py3k/PC/pyconfig.h	Wed Jun  3 07:19:18 2009
@@ -638,7 +638,9 @@
 /* #undef HAVE_WAITPID */
 
 /* Define to 1 if you have the `wcsftime' function. */
+#if defined(_MSC_VER) && _MSC_VER >= 1310
 #define HAVE_WCSFTIME 1
+#endif
 
 /* Define to 1 if you have the `wcscoll' function. */
 #ifndef MS_WINCE