Changeset 94952 in webkit


Ignore:
Timestamp:
Sep 12, 2011 4:03:02 AM (13 years ago)
Author:
Patrick Gansterer
Message:

Unreviewed build fix after r94871.

  • runtime/InitializeThreading.cpp:

(JSC::initializeThreadingOnce):

  • wtf/FastMalloc.cpp:
  • wtf/RefCountedLeakCounter.h:
Location:
trunk/Source/JavaScriptCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r94942 r94952  
     12011-09-12  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Unreviewed build fix after r94871.
     4
     5        * runtime/InitializeThreading.cpp:
     6        (JSC::initializeThreadingOnce):
     7        * wtf/FastMalloc.cpp:
     8        * wtf/RefCountedLeakCounter.h:
     9
    1102011-09-11  Filip Pizlo  <fpizlo@apple.com>
    211
  • trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp

    r94920 r94952  
    5757#endif
    5858    JSGlobalData::storeVPtrs();
     59#if ENABLE(JIT) && ENABLE(ASSEMBLER)
    5960    ExecutableAllocator::initializeAllocator();
     61#endif
    6062#if ENABLE(JSC_MULTIPLE_THREADS)
    6163    RegisterFile::initializeThreading();
  • trunk/Source/JavaScriptCore/wtf/FastMalloc.cpp

    r93012 r94952  
    8181#include <limits>
    8282#if ENABLE(WTF_MULTIPLE_THREADS)
    83 #if OS(WINDOWS) && PLATFORM(CHROMIUM)
     83#if OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
    8484#include <windows.h>
    8585#else
    8686#include <pthread.h>
    87 #endif // OS(WINDOWS)
     87#endif // OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
    8888#endif
    8989#include <wtf/StdLibExtras.h>
     
    108108
    109109#if ENABLE(WTF_MULTIPLE_THREADS)
    110 #if OS(WINDOWS) && PLATFORM(CHROMIUM)
     110#if OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
     111
     112// TLS_OUT_OF_INDEXES is not defined on WinCE.
     113#ifndef TLS_OUT_OF_INDEXES
     114#define TLS_OUT_OF_INDEXES 0xffffffff
     115#endif
    111116
    112117static DWORD isForibiddenTlsIndex = TLS_OUT_OF_INDEXES;
     
    166171    pthread_setspecific(isForbiddenKey, 0);
    167172}
    168 #endif // OS(WINDOWS) && PLATFORM(CHROMIUM)
     173#endif // OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN)
    169174#else
    170175
  • trunk/Source/JavaScriptCore/wtf/RefCountedLeakCounter.h

    r36631 r94952  
    3939#ifndef NDEBUG
    4040    private:
     41#if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE)
     42        int m_count;
     43#else
    4144        volatile int m_count;
     45#endif
    4246        const char* m_description;
    4347#endif
Note: See TracChangeset for help on using the changeset viewer.