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 181379 5cfcff3753298cfa4aedfbb11eb34b01a16296b4
parent 181378 8357ee9066a8c4f1a57a7f5199365c64b00a4b22
child 181380 5c4e8fca7cc5df11ed56190aea0906b77e4f2ec5
push id5439
push userffxbld
push dateMon, 17 Mar 2014 23:08:15 +0000
treeherdermozilla-aurora@c0befb3c8038 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs971822
milestone30.0a1
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