mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 05:11:16 +00:00
Backed out changeset 0ddf006ab8f0 (bug 1274334) for causing win 2012 bustages on WebGLRenderingContextBinding.h. CLOSED TREE
This commit is contained in:
parent
85694e7eee
commit
639fa048d6
@ -8,7 +8,9 @@
|
||||
#ifndef mozilla_${HEADER}_h
|
||||
#define mozilla_${HEADER}_h
|
||||
|
||||
#if defined(__cpp_exceptions) && __cpp_exceptions
|
||||
// For some reason, Apple's GCC refuses to honor -fno-exceptions when
|
||||
// compiling ObjC.
|
||||
#if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
|
||||
# error "STL code can only be used with -fno-exceptions"
|
||||
#endif
|
||||
|
||||
|
@ -125,6 +125,9 @@ case "$target" in
|
||||
fi
|
||||
WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && (pwd -W 2>/dev/null || pwd)`
|
||||
fi
|
||||
|
||||
WRAP_STL_INCLUDES=1
|
||||
STL_FLAGS="-I${DIST}/stl_wrappers"
|
||||
else
|
||||
# Check w32api version
|
||||
_W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
|
||||
@ -600,8 +603,14 @@ MOZ_CXX11
|
||||
|
||||
AC_LANG_C
|
||||
|
||||
STL_FLAGS="-I${DIST}/stl_wrappers"
|
||||
WRAP_STL_INCLUDES=1
|
||||
case "${OS_TARGET}" in
|
||||
Darwin)
|
||||
;;
|
||||
*)
|
||||
STL_FLAGS="-I${DIST}/stl_wrappers"
|
||||
WRAP_STL_INCLUDES=1
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "$MOZ_BUILD_APP" = "tools/crashreporter/injector"; then
|
||||
WRAP_STL_INCLUDES=
|
||||
|
Loading…
Reference in New Issue
Block a user