From be3ea47e3bcbf7eb64c4922d83698a76e9999725 Mon Sep 17 00:00:00 2001
From: ivan <ivan@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 15 May 2023 14:30:14 +0000
Subject: On 1.7.x branch: Merge 1902628 and 1902629 from trunk:   win32: Move
 warning settings to CMakeLists.txt compile options instead of   changing them
 in include/apr.h: otherwise any application the uses APR gets   warning
 settings from APR.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1909838 13f79535-47bb-0310-9956-ffa450edef68
---
 CMakeLists.txt  |  6 ++++++
 include/apr.hwc | 13 -------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9acabc912..05e2ae587 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,6 +260,12 @@ SET(APR_TEST_SUITES
 SET(install_targets)
 SET(install_bin_pdb)
 
+IF (MSVC)
+  # Ignore Microsoft's interpretation of secure development
+  # and the POSIX string handling API
+  ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_WARNINGS)
+ENDIF()
+
 # libapr-1 is shared, apr-1 is static
 ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
 SET(install_targets ${install_targets} libapr-1)
diff --git a/include/apr.hwc b/include/apr.hwc
index ef00a45bb..f6672ce54 100644
--- a/include/apr.hwc
+++ b/include/apr.hwc
@@ -64,16 +64,6 @@
 #pragma warning(disable: 4100 4127 4163 4201 4514; once: 4057 4075 4244)
 #endif
 
-/* Ignore Microsoft's interpretation of secure development
- * and the POSIX string handling API
- */
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-#pragma warning(disable: 4996)
-#endif
-
 /* Has windows.h already been included?  If so, our preferences don't matter,
  * but we will still need the winsock things no matter what was included.
  * If not, include a restricted set of windows headers to our tastes.
@@ -654,9 +644,6 @@ typedef  int         gid_t;
  */
 #if defined(_MSC_VER) && _MSC_VER >= 1200
 #pragma warning(pop)
-#if _MSC_VER >= 1400
-#pragma warning(disable: 4996)
-#endif
 #endif
 
 #endif /* WIN32 */
-- 
cgit v1.2.1