You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2023/05/15 14:30:14 UTC
svn commit: r1909838 - in /apr/apr/branches/1.7.x: ./ CMakeLists.txt include/apr.hwc
Author: ivan
Date: Mon May 15 14:30:14 2023
New Revision: 1909838
URL: http://svn.apache.org/viewvc?rev=1909838&view=rev
Log:
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.
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/CMakeLists.txt
apr/apr/branches/1.7.x/include/apr.hwc
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/branches/1.8.x:r1909837
Merged /apr/apr/trunk:r1902628-1902629
Modified: apr/apr/branches/1.7.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CMakeLists.txt?rev=1909838&r1=1909837&r2=1909838&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr/branches/1.7.x/CMakeLists.txt Mon May 15 14:30:14 2023
@@ -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)
Modified: apr/apr/branches/1.7.x/include/apr.hwc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/include/apr.hwc?rev=1909838&r1=1909837&r2=1909838&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/include/apr.hwc (original)
+++ apr/apr/branches/1.7.x/include/apr.hwc Mon May 15 14:30:14 2023
@@ -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 */