Consolidate the way WTF_USE_PTHREADS is enabled
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Feb 2013 21:04:01 +0000 (21:04 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Feb 2013 21:04:01 +0000 (21:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=108191

Patch by Laszlo Gombos <l.gombos@samsung.com> on 2013-02-10
Reviewed by Benjamin Poulain.

.:

Remove duplicated definition of WTF_USE_PTHREADS.

WTF_USE_PTHREADS is defined to 1 on all OS(UNIX) environments in
Platform.h.

* Source/cmake/OptionsBlackBerry.cmake:
* Source/cmake/OptionsEfl.cmake:

Source/WTF:

Define WTF_USE_PTHREADS to 1 on all OS(UNIX) environments.

* WTF.gyp/WTF.gyp: Remove duplicated definition of WTF_USE_PTHREADS.
* wtf/Platform.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142417 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WTF/ChangeLog
Source/WTF/WTF.gyp/WTF.gyp
Source/WTF/wtf/Platform.h
Source/cmake/OptionsBlackBerry.cmake
Source/cmake/OptionsEfl.cmake

index 936e213595623bfb14f767e08db023c1f52eb7e7..2a6a736a1fa0e73aabba293a35c3b678a22cd14b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2013-02-10  Laszlo Gombos  <l.gombos@samsung.com>
+
+        Consolidate the way WTF_USE_PTHREADS is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=108191
+
+        Reviewed by Benjamin Poulain.
+
+        Remove duplicated definition of WTF_USE_PTHREADS.
+
+        WTF_USE_PTHREADS is defined to 1 on all OS(UNIX) environments in 
+        Platform.h.
+
+        * Source/cmake/OptionsBlackBerry.cmake:
+        * Source/cmake/OptionsEfl.cmake:
+
 2013-02-10  Jae Hyun Park  <jae.park08@gmail.com>
 
         Rename ENABLE(GLIB_SUPPORT) to USE(GLIB)
index 1021bb3fdbaf6e712068e5de7096d08a41d3dd3a..e6e1796a3a655358eee2241c8abebc9363c0b83f 100644 (file)
@@ -1,3 +1,15 @@
+2013-02-10  Laszlo Gombos  <l.gombos@samsung.com>
+
+        Consolidate the way WTF_USE_PTHREADS is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=108191
+
+        Reviewed by Benjamin Poulain.
+
+        Define WTF_USE_PTHREADS to 1 on all OS(UNIX) environments.
+
+        * WTF.gyp/WTF.gyp: Remove duplicated definition of WTF_USE_PTHREADS.
+        * wtf/Platform.h:
+
 2013-02-10  Laszlo Gombos  <l.gombos@samsung.com>
 
         Refactor the way HAVE_XXX macros are set
index be9b1c5cb26f7f761a6cf36586fd0dc7d2fade5d..fdc53851a264545eaab7dd53bf31c89ef422bd37 100644 (file)
               'WTF_USE_NEW_THEME=1',
             ],
           }],
-          ['os_posix == 1 and OS != "mac"', {
-            'defines': [
-              'WTF_USE_PTHREADS=1',
-            ],
-          }],
         ],
       },
     },
index 4deafc553ca7be04e05cb38c41b8bd4bc1f42f39..44f1d00712faa67cc058fe862ff8c8dab0d939fd 100644 (file)
 #define ENABLE_DASHBOARD_SUPPORT 1
 #endif
 #define WTF_USE_CF 1
-#define WTF_USE_PTHREADS 1
 #define HAVE_READLINE 1
 #define HAVE_RUNLOOP_TIMER 1
 #define ENABLE_FULLSCREEN_API 1
 
 #if PLATFORM(CHROMIUM) && OS(DARWIN)
 #define WTF_USE_CF 1
-#define WTF_USE_PTHREADS 1
 #define WTF_USE_WK_SCROLLBAR_PAINTER 1
 #endif
 
 #define WTF_USE_CF 1
 #define WTF_USE_CFNETWORK 1
 #define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
-#define WTF_USE_PTHREADS 1
 #define WTF_USE_WEB_THREAD 1
 
 #if PLATFORM(IOS_SIMULATOR)
 #endif
 #endif
 
-#if OS(UNIX) && (PLATFORM(GTK) || PLATFORM(QT))
-#define WTF_USE_PTHREADS 1
-#endif
-
 #if !defined(HAVE_ACCESSIBILITY)
 #if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && !OS(ANDROID)) || PLATFORM(EFL)
 #define HAVE_ACCESSIBILITY 1
 #define HAVE_SYS_PARAM_H 1
 #define HAVE_SYS_TIME_H 1 
 #define WTF_USE_OS_RANDOMNESS 1
+#define WTF_USE_PTHREADS 1
 #endif /* OS(UNIX) */
 
 #if OS(UNIX) && !OS(ANDROID) && !OS(QNX)
 #if OS(QNX)
 #define HAVE_MADV_FREE_REUSE 1
 #define HAVE_MADV_FREE 1
-#define WTF_USE_PTHREADS 1
 #endif
 
 /* ENABLE macro defaults */
index 91e5e86f958e78f245bdd69314923fddf2cbdd9b..22b26b4c218c22f5438d9e6a7dec86e27a6694b7 100644 (file)
@@ -14,8 +14,6 @@ add_definitions(-DBUILD_WEBKIT)
 add_definitions(-DSK_RELEASE)
 
 # TODO: Make this build-time configurable
-set(WTF_USE_PTHREADS 1)
-add_definitions(-DWTF_USE_PTHREADS=1)
 set(WTF_USE_OPENTYPE_SANITIZER 1)
 add_definitions(-DWTF_USE_OPENTYPE_SANITIZER=1)
 
index c6f46c5e5b9c3ab9dd0b7577254ab0fa9a32b9fc..8fdf0c3e492ed9d89b67987bdb8a4c413bda6d6f 100644 (file)
@@ -31,7 +31,6 @@ set(WTF_USE_SOUP 1)
 
 add_definitions(-DWTF_USE_GLIB=1)
 add_definitions(-DWTF_USE_SOUP=1)
-add_definitions(-DWTF_USE_PTHREADS=1)
 add_definitions(-DWTF_USE_ICU_UNICODE=1)
 add_definitions(-DWTF_USE_CAIRO=1)