1) Pretty sure that pragma is MSVC specific. 2) Whatever bug that was it is not present in MinGW.

This commit is contained in:
Ben "root" Anderson
2013-10-26 17:47:57 -05:00
parent b3a5d8ea49
commit 2aabd327b3
+2 -2
View File
@@ -7,7 +7,7 @@
#include <setjmp.h>
#if defined(WIN32)
#if defined(WIN32) && !defined(__MINGW32__)
// work around namespace bugs in win32/libjpeg:
#define XMD_H
#undef FAR
@@ -16,9 +16,9 @@
#if defined(_MSC_VER)
#pragma comment(lib, "jpeg.lib")
#pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
#endif
#pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */
#else
extern "C" {
#if defined(MACOSX)