[Python-checkins] r52818 - in python/branches/release25-maint: Misc/NEWS PC/pyconfig.h

[martin.v.loewis]

Author: martin.v.loewis
Date: Tue Nov 21 19:21:34 2006
New Revision: 52818

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/PC/pyconfig.h
Log:
Conditionalize definition of _CRT_SECURE_NO_DEPRECATE
and _CRT_NONSTDC_NO_DEPRECATE.


Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Nov 21 19:21:34 2006
@@ -206,6 +206,13 @@
   files in VC7.
 
 
+Windows
+-------
+
+- Conditionalize definition of _CRT_SECURE_NO_DEPRECATE
+  and _CRT_NONSTDC_NO_DEPRECATE.
+
+
 What's New in Python 2.5 (final)
 ================================
 

Modified: python/branches/release25-maint/PC/pyconfig.h
==============================================================================
--- python/branches/release25-maint/PC/pyconfig.h	(original)
+++ python/branches/release25-maint/PC/pyconfig.h	Tue Nov 21 19:21:34 2006
@@ -39,8 +39,12 @@
    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