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/Types/Gtk/BCThreadingGtk.h

    r424 r427  
    6464#include <wtf/Noncopyable.h> 
    6565 
    66 // On wx/Win, including windows.h here causes multiply-defined symbol errors 
    67 // for libjpeg and wx, and also wx needs to include windows.h itself first for wx 
    68 // includes to work right. So until we can find a better solution to this problem, 
    69 // on wx, we workaround including windows.h here. 
    70 #if PLATFORM(WIN_OS) && !PLATFORM(WX) 
     66#if PLATFORM(WIN_OS) 
    7167#include <windows.h> 
    7268#elif PLATFORM(DARWIN) 
    …… 
    178174 
    179175#if COMPILER(MINGW) || COMPILER(MSVC7) 
    180 #if PLATFORM(WX) 
    181 // we define these prototypes to avoid a dependency on windows.h in the header. See comment at top of header. 
    182 long InterlockedIncrement(long *Addend); 
    183 long InterlockedDecrement(long *Addend); 
    184 #endif 
    185176inline void atomicIncrement(int* addend) { InterlockedIncrement(reinterpret_cast<long*>(addend)); } 
    186177inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); } 
    187178#else 
    188 #if PLATFORM(WX) 
    189 // we define these prototypes to avoid a dependency on windows.h in the header. See comment at top of header. 
    190 long InterlockedIncrement(long volatile *Addend); 
    191 long InterlockedDecrement(long volatile *Addend); 
    192 #endif 
    193179inline void atomicIncrement(int volatile* addend) { InterlockedIncrement(reinterpret_cast<long volatile*>(addend)); } 
    194180inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }