Changeset 142417 in webkit


Ignore:
Timestamp:
Feb 10, 2013 1:04:01 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Consolidate the way WTF_USE_PTHREADS is enabled
​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:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r142395 r142417  
     12013-02-10  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        Consolidate the way WTF_USE_PTHREADS is enabled
     4        https://bugs.webkit.org/show_bug.cgi?id=108191
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Remove duplicated definition of WTF_USE_PTHREADS.
     9
     10        WTF_USE_PTHREADS is defined to 1 on all OS(UNIX) environments in
     11        Platform.h.
     12
     13        * Source/cmake/OptionsBlackBerry.cmake:
     14        * Source/cmake/OptionsEfl.cmake:
     15
    1162013-02-10  Jae Hyun Park  <jae.park08@gmail.com>
    217

  • trunk/Source/WTF/ChangeLog

    r142399 r142417  
     12013-02-10  Laszlo Gombos  <l.gombos@samsung.com>
     2
     3        Consolidate the way WTF_USE_PTHREADS is enabled
     4        https://bugs.webkit.org/show_bug.cgi?id=108191
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Define WTF_USE_PTHREADS to 1 on all OS(UNIX) environments.
     9
     10        * WTF.gyp/WTF.gyp: Remove duplicated definition of WTF_USE_PTHREADS.
     11        * wtf/Platform.h:
     12
    1132013-02-10  Laszlo Gombos  <l.gombos@samsung.com>
    214

  • trunk/Source/WTF/WTF.gyp/WTF.gyp

    r142298 r142417  
    8282            'defines': [
    8383              'WTF_USE_NEW_THEME=1',
    84             ],
    85           }],
    86           ['os_posix == 1 and OS != "mac"', {
    87             'defines': [
    88               'WTF_USE_PTHREADS=1',
    8984            ],
    9085          }],

  • trunk/Source/WTF/wtf/Platform.h

    r142399 r142417  
    556556#endif
    557557#define WTF_USE_CF 1
    558 #define WTF_USE_PTHREADS 1
    559558#define HAVE_READLINE 1
    560559#define HAVE_RUNLOOP_TIMER 1
    … …  
    575574#if PLATFORM(CHROMIUM) && OS(DARWIN)
    576575#define WTF_USE_CF 1
    577 #define WTF_USE_PTHREADS 1
    578576#define WTF_USE_WK_SCROLLBAR_PAINTER 1
    579577#endif
    … …  
    617615#define WTF_USE_CFNETWORK 1
    618616#define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
    619 #define WTF_USE_PTHREADS 1
    620617#define WTF_USE_WEB_THREAD 1
    621618
    … …  
    666663#define ENABLE_WEB_ARCHIVE 1
    667664#endif
    668 #endif
    669 
    670 #if OS(UNIX) && (PLATFORM(GTK) || PLATFORM(QT))
    671 #define WTF_USE_PTHREADS 1
    672665#endif
    673666
    … …  
    686679#define HAVE_SYS_TIME_H 1
    687680#define WTF_USE_OS_RANDOMNESS 1
     681#define WTF_USE_PTHREADS 1
    688682#endif /* OS(UNIX) */
    689683
    … …  
    751745#define HAVE_MADV_FREE_REUSE 1
    752746#define HAVE_MADV_FREE 1
    753 #define WTF_USE_PTHREADS 1
    754747#endif
    755748

  • trunk/Source/cmake/OptionsBlackBerry.cmake

    r141108 r142417  
    1515
    1616# TODO: Make this build-time configurable
    17 set(WTF_USE_PTHREADS 1)
    18 add_definitions(-DWTF_USE_PTHREADS=1)
    1917set(WTF_USE_OPENTYPE_SANITIZER 1)
    2018add_definitions(-DWTF_USE_OPENTYPE_SANITIZER=1)

  • trunk/Source/cmake/OptionsEfl.cmake

    r142395 r142417  
    3232add_definitions(-DWTF_USE_GLIB=1)
    3333add_definitions(-DWTF_USE_SOUP=1)
    34 add_definitions(-DWTF_USE_PTHREADS=1)
    3534add_definitions(-DWTF_USE_ICU_UNICODE=1)
    3635add_definitions(-DWTF_USE_CAIRO=1)
Note: See TracChangeset for help on using the changeset viewer.