From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 21 Nov 2006 18:20:25 +0000 (+0000)
Subject: Conditionalize definition of _CRT_SECURE_NO_DEPRECATE
X-Git-Tag: v2.6a1~2411
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2607e6c02195538db13b8c3d5d8c7d6b820df71a;p=thirdparty%2FPython%2Fcpython.git

Conditionalize definition of _CRT_SECURE_NO_DEPRECATE
and _CRT_NONSTDC_NO_DEPRECATE.
Will backport.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index d58cce51460c..8754f026f41a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -347,6 +347,13 @@ C API
   so it can be used as an expression.
 
 
+Windows
+-------
+
+- Conditionalize definition of _CRT_SECURE_NO_DEPRECATE
+  and _CRT_NONSTDC_NO_DEPRECATE.
+
+
 Mac
 ---
 
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 4aedce73ac42..f2ef7f95b8ae 100644
--- 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