Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 669403: Always build both VC9 and VC10 exception-wrapping hackery into the Gecko SDK. r=bsmedberg

Browse Source
This commit is contained in:
Chris Jones 2011-08-31 11:05:20 -07:00
parent 90221339d6
commit aa1ba63c54
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
memory/mozalloc/Makefile.in
View File

@ -85,20 +85,31 @@ ifdef GNU_CXX #{
EXPORTS_mozilla += throw_gcc.h
else
ifdef _MSC_VER #{
EXPORTS_mozilla += throw_msvc.h
ifdef MOZ_MSVC_STL_WRAP__Throw #{
EXPORTS_mozilla += msvc_throw_wrapper.h
CPPSRCS += msvc_throw_wrapper.cpp
ifeq ($(MOZ_MSVC_STL_WRAP__RAISE),1) #{
BUILD_MSVC_WRAPPERS = 1
else
ifdef MOZ_MSVC_STL_WRAP__RAISE #{
EXPORTS_mozilla += msvc_raise_wrappers.h
CPPSRCS += msvc_raise_wrappers.cpp
else
$(error Unknown STL wrapper tactic for MSVC)
ifeq ($(MOZ_MSVC_STL_WRAP__Throw),1) #{
BUILD_MSVC_WRAPPERS = 1
endif #}
endif #}
ifdef BUILD_MSVC_WRAPPERS #{
EXPORTS_mozilla += \
msvc_raise_wrappers.h \
msvc_throw_wrapper.h \
throw_msvc.h \
$(NULL)
CPPSRCS += \
msvc_raise_wrappers.cpp \
msvc_throw_wrapper.cpp \
$(NULL)
endif #}
endif #}
endif #}
endif #}
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))

2
memory/mozalloc/msvc_raise_wrappers.cpp
View File

@ -44,6 +44,8 @@
# define MOZALLOC_EXPORT __declspec(dllexport)
#endif
#include "mozalloc_abort.h"
#define MOZALLOC_DONT_WRAP_RAISE_FUNCTIONS
#include "mozilla/throw_msvc.h"