]> git.pld-linux.org Git - packages/gtk-webkit3.git/commitdiff
- don't include pthread.h inside of c++ namespace
authorJan Rękorajski <baggins@pld-linux.org>
Fri, 12 Apr 2013 10:26:17 +0000 (12:26 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Fri, 12 Apr 2013 10:26:17 +0000 (12:26 +0200)
sync-builtins.patch

index f32f194f3db4ba2261b9ff243ded1746a0c04462..4c582b66f36de46223e9cfc7b45527a52080017b 100644 (file)
  ######################################################################################
 --- 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; }
This page took 0.248832 seconds and 4 git commands to generate.