Changeset 94952 in webkit
- Timestamp:
- Sep 12, 2011 4:03:02 AM (13 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r94942 r94952 1 2011-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 1 10 2011-09-11 Filip Pizlo <fpizlo@apple.com> 2 11 -
trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp
r94920 r94952 57 57 #endif 58 58 JSGlobalData::storeVPtrs(); 59 #if ENABLE(JIT) && ENABLE(ASSEMBLER) 59 60 ExecutableAllocator::initializeAllocator(); 61 #endif 60 62 #if ENABLE(JSC_MULTIPLE_THREADS) 61 63 RegisterFile::initializeThreading(); -
trunk/Source/JavaScriptCore/wtf/FastMalloc.cpp
r93012 r94952 81 81 #include <limits> 82 82 #if ENABLE(WTF_MULTIPLE_THREADS) 83 #if OS(WINDOWS) && PLATFORM(CHROMIUM) 83 #if OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN) 84 84 #include <windows.h> 85 85 #else 86 86 #include <pthread.h> 87 #endif // OS(WINDOWS) 87 #endif // OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN) 88 88 #endif 89 89 #include <wtf/StdLibExtras.h> … … 108 108 109 109 #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 111 116 112 117 static DWORD isForibiddenTlsIndex = TLS_OUT_OF_INDEXES; … … 166 171 pthread_setspecific(isForbiddenKey, 0); 167 172 } 168 #endif // OS(WINDOWS) && PLATFORM(CHROMIUM) 173 #endif // OS(WINDOWS) && PLATFORM(CHROMIUM) || OS(WINCE) && PLATFORM(WIN) 169 174 #else 170 175 -
trunk/Source/JavaScriptCore/wtf/RefCountedLeakCounter.h
r36631 r94952 39 39 #ifndef NDEBUG 40 40 private: 41 #if COMPILER(MINGW) || COMPILER(MSVC7_OR_LOWER) || OS(WINCE) 42 int m_count; 43 #else 41 44 volatile int m_count; 45 #endif 42 46 const char* m_description; 43 47 #endif
Note: See TracChangeset
for help on using the changeset viewer.