Changeset 95110 in webkit


Ignore:
Timestamp:
Sep 14, 2011 12:10:04 PM (13 years ago)
Author:
Csaba Osztrogonác
Message:

[Qt] Win32 builds with threads turned off
https://bugs.webkit.org/show_bug.cgi?id=67864

Reviewed by Geoffrey Garen.

  • JavaScriptCore.pri: Link pthread library on Windows platform.
  • wtf/Platform.h: Enable multiple threads.
Location:
trunk/Source/JavaScriptCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r95108 r95110  
     12011-09-14  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        [Qt] Win32 builds with threads turned off
     4        https://bugs.webkit.org/show_bug.cgi?id=67864
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * JavaScriptCore.pri: Link pthread library on Windows platform.
     9        * wtf/Platform.h: Enable multiple threads.
     10
    1112011-09-14  Mark Hahnenberg  <mhahnenberg@apple.com>
    212
  • trunk/Source/JavaScriptCore/JavaScriptCore.pri

    r94866 r95110  
    5050    LIBS += -lhal
    5151    INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
     52}
     53
     54win32-g++* {
     55    LIBS += -lpthreadGC2
     56} else:win32-msvc* {
     57    LIBS += -lpthreadVC2
    5258}
    5359
  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r94992 r95110  
    510510#endif
    511511
    512 /* FIXME: JSC multithreading currently only supports pthread.
    513    Qt-Win cannot do multithreading because it is not pthread-based. */
    514512#if !defined(ENABLE_JSC_MULTIPLE_THREADS)
    515 #if !PLATFORM(QT) || USE(PTHREAD_BASED_QT)
    516513#define ENABLE_JSC_MULTIPLE_THREADS 1
    517514#endif
    518 #endif
    519 
    520 /* FIXME: JSC multithreading currently only supports pthread.
    521    Qt-Win cannot do multithreading because it is not pthread-based. */
     515
    522516#if !defined(ENABLE_WTF_MULTIPLE_THREADS)
    523 #if !PLATFORM(QT) || USE(PTHREAD_BASED_QT)
    524517#define ENABLE_WTF_MULTIPLE_THREADS 1
    525 #endif
    526518#endif
    527519
Note: See TracChangeset for help on using the changeset viewer.