Show
Ignore:
Timestamp:
08/01/08 14:47:24 (5 months ago)
Author:
sroret
Message:

merge with webkit revision 35510

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BAL/OWBAL/Concretizations/ImageDecoder/JPEG/WK/BCJPEGImageDecoderWK.cpp

    r243 r427  
    4646// Remove warnings from warning level 4. 
    4747#pragma warning(disable : 4611) // warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable 
    48 #endif 
     48 
     49// if ADDRESS_TAG_BIT is dfined, INT32 has been declared as a typedef in the PlatformSDK (BaseTsd.h), 
     50// so we need to stop jpeglib.h from trying to #define it  
     51// see here for more info: http://www.cygwin.com/ml/cygwin/2004-07/msg01051.html 
     52# if defined(ADDRESS_TAG_BIT) && !defined(XMD_H) 
     53#  define XMD_H 
     54#  define VTK_JPEG_XMD_H 
     55# endif 
     56#endif // COMPILER(MSVC) 
    4957 
    5058extern "C" { 
    5159#include "jpeglib.h" 
    5260} 
     61 
     62#if COMPILER(MSVC) 
     63# if defined(VTK_JPEG_XMD_H) 
     64#  undef VTK_JPEG_XMD_H 
     65#  undef XMD_H 
     66# endif 
     67#endif // COMPILER(MSVC) 
    5368 
    5469#include <setjmp.h>