Changeset 35367 in webkit for trunk/JavaScriptCore/wtf/Threading.h

Timestamp:

Jul 25, 2008, 7:28:57 PM (17 years ago)

Author:

[email protected]

Message:

On wx/Win, including windows.h in Threading.h causes multiply-defined symbol errors for libjpeg and wx, and also wx needs to include windows.h itself first for wx includes to work right. So until we can find a better solution to this problem on wx, we work around the need to include windows.h here.

File:

• trunk/JavaScriptCore/wtf/Threading.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/Threading.h

@@ -64 +64 @@
 #include <wtf/Noncopyable.h>
 
-#if PLATFORM(WIN_OS)
+// On wx/Win, including windows.h here causes multiply-defined symbol errors
+// for libjpeg and wx, and also wx needs to include windows.h itself first for wx
+// includes to work right. So until we can find a better solution to this problem,
+// on wx, we workaround including windows.h here.
+#if PLATFORM(WIN_OS) && !PLATFORM(WX)
 #include <windows.h>
 #elif PLATFORM(DARWIN)
@@ -169 +173 @@
 };
 
-#if PLATFORM(WIN_OS) && !COMPILER(MSVC7)
+#if PLATFORM(WIN_OS)
 #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
 
-#if COMPILER(MINGW)
+#if COMPILER(MINGW) || COMPILER(MSVC7)
+#if PLATFORM(WX)
+// we define these prototypes to avoid a dependency on windows.h in the header. See comment at top of header.
+long InterlockedIncrement(long *Addend);
+long InterlockedDecrement(long *Addend);
+#endif
 inline void atomicIncrement(int* addend) { InterlockedIncrement(reinterpret_cast<long*>(addend)); }
 inline int atomicDecrement(int* addend) { return InterlockedDecrement(reinterpret_cast<long*>(addend)); }
 #else
+#if PLATFORM(WX)
+// we define these prototypes to avoid a dependency on windows.h in the header. See comment at top of header.
+long InterlockedIncrement(long volatile *Addend);
+long InterlockedDecrement(long volatile *Addend);
+#endif
 inline void atomicIncrement(int volatile* addend) { InterlockedIncrement(reinterpret_cast<long volatile*>(addend)); }
 inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }