Bug 562655 - Port bug 560723 - Sort out why the _Throw() hack doesn't work on VC10, and find an alternative to comm-central; (Bv1) Correctly port bug 557060, Remove another related MOZILLA_1_9_2_BRANCH check.
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 29 Apr 2010 20:40:21 +0200
changeset 5551 182e43de366ef4eee02fbf8907a3cb4b9ee7df69
parent 5550 87899a3eea57f8144b761242e77bf9a0fbc1d5dc
child 5552 da58a1f76718645b8dc11a49233c95c0d3ec09b6
push idunknown
push userunknown
push dateunknown
bugs562655, 560723, 557060, 551254
Bug 562655 - Port bug 560723 - Sort out why the _Throw() hack doesn't work on VC10, and find an alternative to comm-central; (Bv1) Correctly port bug 557060, Remove another related MOZILLA_1_9_2_BRANCH check. r=kairo a=Standard8. (CLOSED TREE) Bug 557060 - [Windows] After bug 551254, Firefox/SeaMonkey fails to build or run with error like "?_Throw@std@@YAXABVexception@stdext@@@Z"
configure.in
--- a/configure.in
+++ b/configure.in
@@ -866,20 +866,16 @@ EOF
         AC_MSG_ERROR([You are targeting Windows version 0x$MOZ_WINSDK_TARGETVER, but your SDK only supports up to version $MOZ_WINSDK_MAXVER. Install and use an updated SDK, or target a lower version using --with-windows-version. See https://developer.mozilla.org/En/Windows_SDK_versions for more details on fixing this.])
     fi
 
     AC_DEFINE_UNQUOTED(MOZ_WINSDK_TARGETVER,0x$MOZ_WINSDK_TARGETVER)
     # Definitions matching sdkddkver.h
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_WS03, 0x05020000)
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_LONGHORN, 0x06000000)
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_WIN7, 0x06010000)
-
-  if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
-    STL_FLAGS='-D_HAS_EXCEPTIONS=0 -I$(DIST)/stl_wrappers'
-  fi
     ;;
 esac
 
 dnl Test breaks icc on OS/2 && MSVC
 if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then
     AC_PROG_CC_C_O
     if grep "NO_MINUS_C_MINUS_O 1" ./confdefs.h >/dev/null; then
         USING_HCC=1
@@ -3184,19 +3180,17 @@ EOF
                            ac_cv_visibility_builtin_bug=yes
                          fi
                        fi
                        rm -f conftest.{c,S}
                        ])
         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
                 "$ac_cv_have_visibility_class_bug" = "no"; then
           VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(MOZILLA_SRCDIR)/config/gcc_hidden.h'
-         if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
           STL_FLAGS='-I$(DIST)/stl_wrappers'
-         fi
         else
           VISIBILITY_FLAGS='-fvisibility=hidden'
         fi # have visibility pragma bug
       fi   # have visibility pragma
     fi     # have visibility(default) attribute
   fi       # have visibility(hidden) attribute
 fi         # GNU_CC