Bug 945216 - Fixed mozglue/ compilation on mingw. r=glandium

This commit is contained in:
Jacek Caban 2013-12-17 12:01:39 +01:00
parent 8f254a1c64
commit 3ca7c890e6
2 changed files with 4 additions and 4 deletions

View File

@ -47,7 +47,7 @@ endif
EXTRA_DSO_LDOPTS += \
version.lib \
$(call EXPAND_LIBNAME,version) \
$(NULL)
STL_FLAGS=

View File

@ -163,7 +163,7 @@ static bool sBlocklistInitFailed;
static bool sUser32BeforeBlocklist;
// Duplicated from xpcom glue. Ideally this should be shared.
static void
void
printf_stderr(const char *fmt, ...)
{
if (IsDebuggerPresent()) {
@ -368,7 +368,7 @@ DllBlockSet::Write(HANDLE file)
// Because this method is called after a crash occurs, and uses heap memory,
// protect this entire block with a structured exception handler.
__try {
MOZ_SEH_TRY {
for (DllBlockSet* b = gFirst; b; b = b->mNext) {
// write name[,v.v.v.v];
WriteFile(file, b->mName, strlen(b->mName), &nBytes, nullptr);
@ -391,7 +391,7 @@ DllBlockSet::Write(HANDLE file)
WriteFile(file, ";", 1, &nBytes, nullptr);
}
}
__except (EXCEPTION_EXECUTE_HANDLER) { }
MOZ_SEH_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { }
}
static