[packages/gtk-webkit3] - don't include pthread.h inside of c++ namespace
baggins
baggins at pld-linux.org
Fri Apr 12 12:26:42 CEST 2013
commit 3ccee29648c2cac90b3a746efed801347b70ebfe
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Apr 12 12:26:17 2013 +0200
- don't include pthread.h inside of c++ namespace
sync-builtins.patch | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/sync-builtins.patch b/sync-builtins.patch
index f32f194..4c582b6 100644
--- a/sync-builtins.patch
+++ b/sync-builtins.patch
@@ -21,7 +21,17 @@
######################################################################################
--- webkitgtk-2.0.0/Source/WTF/wtf/Atomics.h~ 2013-04-12 08:05:55.951740895 +0200
+++ webkitgtk-2.0.0/Source/WTF/wtf/Atomics.h 2013-04-12 08:22:46.701992338 +0200
-@@ -113,8 +113,16 @@
+@@ -70,6 +70,9 @@
+ #elif OS(ANDROID)
+ #include <sys/atomics.h>
+ #endif
++#ifdef HAVE_64BIT_SYNC_BUILTINS
++#include <pthread.h>
++#endif
+
+ namespace WTF {
+
+@@ -113,8 +113,15 @@
inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); }
inline int atomicDecrement(int volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
@@ -29,7 +39,6 @@
inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
+#else
-+#include <pthread.h>
+static pthread_mutex_t global_wtf_lock = PTHREAD_MUTEX_INITIALIZER;
+
+inline int64_t atomicIncrement(int64_t volatile* addend) { pthread_mutex_lock(&global_wtf_lock); *addend++; pthread_mutex_unlock(&global_wtf_lock); return *addend; }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit3.git/commitdiff/3ccee29648c2cac90b3a746efed801347b70ebfe
More information about the pld-cvs-commit
mailing list