Issue python#6183: Disables wcsftime on VC6.

skrah · Jun 3, 2009 · 6b0e51a · 6b0e51a
1 parent 3db5e7b
commit 6b0e51a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -540,7 +540,7 @@ time_strftime(PyObject *self, PyObject *args)
 	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;

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
@@ -638,7 +638,9 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* #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