Allow building with libc++. Add some missing includes.


(joerg)

$NetBSD: patch-Source_WTF_wtf_Atomics.h,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Source/WTF/wtf/Atomics.h.orig	2012-11-23 20:12:16.000000000 +0000
+++ Source/WTF/wtf/Atomics.h
@@ -72,7 +72,10 @@
 #elif OS(ANDROID)
 #include <sys/atomics.h>
 #elif COMPILER(GCC)
-#if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))) && !defined(__LSB_VERSION__)
+#include <ciso646>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <atomic>
+#elif ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))) && !defined(__LSB_VERSION__)
 #include <ext/atomicity.h>
 #else
 #include <bits/atomicity.h>
@@ -112,6 +115,11 @@ inline int atomicDecrement(int volatile*
 inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; }
 inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; }
 
+#elif defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
+inline int atomicIncrement(std::atomic<int> * addend) { return *addend++; }
+inline int atomicDecrement(std::atomic<int> * addend) { return *addend--; }
+
 #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
 #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
 
@@ -227,9 +235,16 @@ inline void memoryBarrierBeforeUnlock() 
 
 #endif
 
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+typedef std::atomic<int> atomic_int;
+#else
+typedef int volatile atomic_int;
+#endif
+
 } // namespace WTF
 
 #if USE(LOCKFREE_THREADSAFEREFCOUNTED)
+using WTF::atomic_int;
 using WTF::atomicDecrement;
 using WTF::atomicIncrement;
 #endif

$NetBSD: patch-Source_WTF_wtf_RefCountedLeakCounter.h,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Source/WTF/wtf/RefCountedLeakCounter.h.orig	2013-05-08 07:48:32.000000000 +0000
+++ Source/WTF/wtf/RefCountedLeakCounter.h
@@ -38,11 +38,7 @@ namespace WTF {
 
 #ifndef NDEBUG
     private:
-#if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
-        int m_count;
-#else
-        volatile int m_count;
-#endif
+        atomic_int m_count;
         const char* m_description;
 #endif
     };

$NetBSD: patch-Source_WTF_wtf_ThreadSafeRefCounted.h,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Source/WTF/wtf/ThreadSafeRefCounted.h.orig	2013-05-08 07:46:55.000000000 +0000
+++ Source/WTF/wtf/ThreadSafeRefCounted.h
@@ -96,7 +96,7 @@ public:
 #if !USE(LOCKFREE_THREADSAFEREFCOUNTED)
         MutexLocker locker(m_mutex);
 #endif
-        return static_cast<int const volatile &>(m_refCount);
+        return m_refCount;
     }
 
 protected:
@@ -123,7 +123,7 @@ protected:
     }
 
 private:
-    int m_refCount;
+    atomic_int m_refCount;
 #if !USE(LOCKFREE_THREADSAFEREFCOUNTED)
     mutable Mutex m_mutex;
 #endif

$NetBSD: patch-Source_WebCore_Modules_webaudio_AudioContext.h,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Source/WebCore/Modules/webaudio/AudioContext.h.orig	2013-05-08 08:53:03.000000000 +0000
+++ Source/WebCore/Modules/webaudio/AudioContext.h
@@ -333,7 +333,7 @@ private:
     enum { MaxNumberOfChannels = 32 };
 
     // Number of AudioBufferSourceNodes that are active (playing).
-    int m_activeSourceCount;
+    atomic_int m_activeSourceCount;
 };
 
 } // WebCore

$NetBSD: patch-Source_WebCore_Modules_webaudio_AudioNode.h,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Source/WebCore/Modules/webaudio/AudioNode.h.orig	2013-05-08 08:53:26.000000000 +0000
+++ Source/WebCore/Modules/webaudio/AudioNode.h
@@ -178,8 +178,8 @@ private:
     double m_lastNonSilentTime;
 
     // Ref-counting
-    volatile int m_normalRefCount;
-    volatile int m_connectionRefCount;
+    atomic_int m_normalRefCount;
+    atomic_int m_connectionRefCount;
     
     bool m_isMarkedForDeletion;
     bool m_isDisabled;

$NetBSD: patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Source/WebCore/platform/gtk/FileSystemGtk.cpp.orig	2012-11-23 20:12:17.000000000 +0000
+++ Source/WebCore/platform/gtk/FileSystemGtk.cpp
@@ -222,7 +222,7 @@ CString sharedResourcesPath()
     GOwnPtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
     GOwnPtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
 #else
-    GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, NULL));
+    GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-" WEBKITGTK_API_VERSION_STRING, NULL));
 #endif
 
     cachedPath = dataPath.get();

$NetBSD: patch-Source_WebCore_platform_network_DNSResolveQueue.h,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Source/WebCore/platform/network/DNSResolveQueue.h.orig	2013-05-08 08:52:14.000000000 +0000
+++ Source/WebCore/platform/network/DNSResolveQueue.h
@@ -56,7 +56,7 @@ private:
     void fired();
 
     HashSet<String> m_names;
-    int m_requestsInFlight;
+    atomic_int m_requestsInFlight;
 };
 
 }

$NetBSD: patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp.orig	2013-05-08 08:54:13.000000000 +0000
+++ Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
@@ -118,7 +118,7 @@ void handleDidGetPlugins(uint64_t reques
 
 static uint64_t generateRequestID()
 {
-    static int uniqueID;
+    static atomic_int uniqueID;
     return atomicIncrement(&uniqueID);
 }
 

$NetBSD: patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Tools/DumpRenderTree/gtk/DumpRenderTree.cpp.orig	2012-11-23 20:12:19.000000000 +0000
+++ Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -46,6 +46,7 @@
 #include "WorkQueueItem.h"
 #include <JavaScriptCore/JavaScript.h>
 #include <cassert>
+#include <clocale>
 #include <cstdlib>
 #include <cstring>
 #include <getopt.h>

$NetBSD: patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp,v 1.1 2013/05/09 14:04:42 joerg Exp $

--- Tools/DumpRenderTree/gtk/ImageDiff.cpp.orig	2013-05-02 21:03:34.000000000 +0000
+++ Tools/DumpRenderTree/gtk/ImageDiff.cpp
@@ -30,6 +30,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <gdk/gdk.h>
 
@@ -157,7 +158,7 @@ void printImage(GdkPixbuf* image)
         return; // Don't bail out, as we can still use the percentage output.
     }
 
-    printf("Content-Length: %"G_GSIZE_FORMAT"\n", bufferSize);
+    printf("Content-Length: %" G_GSIZE_FORMAT "\n", bufferSize);
     fwrite(buffer, 1, bufferSize, stdout);
 }