Conditionalize definition of _CRT_SECURE_NO_DEPRECATE

and _CRT_NONSTDC_NO_DEPRECATE.

diff --git a/Misc/NEWS b/Misc/NEWS
index 231004dc4ae082cd571a782eefd460773a97e229..0cf1c4bf821f609a9f045d36bfe1056553dfc1c0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -206,6 +206,13 @@ Build
   files in VC7.
 
 
+Windows
+-------
+
+- Conditionalize definition of _CRT_SECURE_NO_DEPRECATE
+  and _CRT_NONSTDC_NO_DEPRECATE.
+
+
 What's New in Python 2.5 (final)
 ================================
 

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index e0df67383bd0fffcdcda37286dda4c3fbc8b3622..20201d09ac6532371afa107c7a50322834960219 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -39,8 +39,12 @@ MS_CORE_DLL.
    would be ISO C conforming). Neither renaming is feasible, so
    we just silence the warnings. */
 
+#ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
 #define _CRT_NONSTDC_NO_DEPRECATE 1
+#endif
 
 /* Windows CE does not have these */
 #ifndef MS_WINCE