Bug 971822 - Fix string_util.h combined with strsafe.h on mingw. r=glandium
authorJacek Caban <jacek@codeweavers.com>
Tue, 25 Feb 2014 12:45:47 +0100
changeset 170332 5cfcff3753298cfa4aedfbb11eb34b01a16296b4
parent 170331 8357ee9066a8c4f1a57a7f5199365c64b00a4b22
child 170333 5c4e8fca7cc5df11ed56190aea0906b77e4f2ec5
push id40212
push userjacek@codeweavers.com
push dateTue, 25 Feb 2014 11:46:28 +0000
treeherdermozilla-inbound@17c0f29d7008 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs971822
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 971822 - Fix string_util.h combined with strsafe.h on mingw. r=glandium
configure.in
--- a/configure.in
+++ b/configure.in
@@ -641,16 +641,20 @@ case "$target" in
                 MIDL_FLAGS="$MIDL_FLAGS --win32 -m32"
                 ;;
             x86_64-*)
                 MIDL_FLAGS="$MIDL_FLAGS --win64 -m64"
                 ;;
             esac
         fi
 
+        # strsafe.h on mingw uses macros for function deprecation that pollutes namespace
+        # causing problems with local implementations with the same name.
+        AC_DEFINE(STRSAFE_NO_DEPRECATE)
+
         MOZ_WINSDK_MAXVER=0x06020000
     fi # !GNU_CC
 
     # If MSVC or clang
     if test "$GCC" != "yes" -o -n "$CLANG_CC" ; then
         MOZ_FIND_WINSDK_VERSION
     fi