Bug 611984 - Compilation failure on mingw in modules/libjar after bug 598416 landing r=tglek a=benjamin
authorJacek Caban <jacek@codeweavers.com>
Sat, 22 Jan 2011 12:56:28 +0000
changeset 61137 2e05b59c835240640e860a2cf4641c41e0ad82d7
parent 61136 52d6439d7d19cc07fae8dc50f82c93faecf13a99
child 61138 fa9559ec420a5cedef5b66fc3417d8deb507a4f6
push idunknown
push userunknown
push dateunknown
reviewerstglek, benjamin
bugs611984, 598416
milestone2.0b10pre
Bug 611984 - Compilation failure on mingw in modules/libjar after bug 598416 landing r=tglek a=benjamin
modules/libjar/nsZipArchive.h
--- a/modules/libjar/nsZipArchive.h
+++ b/modules/libjar/nsZipArchive.h
@@ -52,17 +52,17 @@
 #include "plarena.h"
 
 #include "zlib.h"
 #include "zipstruct.h"
 #include "nsAutoPtr.h"
 #include "nsILocalFile.h"
 #include "mozilla/FileUtils.h"
 
-#if defined(XP_WIN)
+#if defined(XP_WIN) && defined(_MSC_VER)
 #define MOZ_WIN_MEM_TRY_BEGIN __try {
 #define MOZ_WIN_MEM_TRY_CATCH(cmd) }                                \
   __except(GetExceptionCode()==EXCEPTION_IN_PAGE_ERROR ?            \
            EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)   \
   {                                                                 \
     NS_WARNING("EXCEPTION_IN_PAGE_ERROR in " __FUNCTION__);         \
     cmd;                                                            \
   }