[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/platform/com_MSC_defs.mk |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 533f708cc872728a7b46705bde53b7499af30d85
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Apr 19 15:02:03 2013 +0300

    Add -wd4996 back in the debvugging runtime (_DEBUG, dbgutil build) case
    
    Otherwise we get: 'std::_Copy_impl': Function call with parameters that
    may be unsafe - this call relies on the caller to check that the
    passed values are correct. To disable this warning, use
    -D_SCL_SECURE_NO_WARNINGS.
    
    Change-Id: I7d9cdb243b1bd7c884c5e4e658cfcd13d1ca8223

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index e33f22e..6f4b6a9 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -126,6 +126,9 @@ gb_AFLAGS := $(AFLAGS)
 # C4800: 'type' : forcing value to bool 'true' or 'false' (performance
 #   warning)
 
+# C4996: 'function': was declared deprecated
+#   Also generated for C++ library functions that "may be unsafe"
+
 gb_CFLAGS := \
 	-Gd \
 	-GR \
@@ -177,6 +180,12 @@ gb_CXXFLAGS := \
 	-Zc:forScope,wchar_t- \
 	-Zm500 \
 
+ifneq ($(MSVC_USE_DEBUG_RUNTIME),)
+gb_CXXFLAGS += \
+	-wd4996 \
+
+endif
+
 # New warning(s) in Visual Studio 2010, let's try disabling these only
 # for that specific compiler version, in case a later one will not
 # need them disabled.