Changeset 52791 in webkit for trunk/JavaScriptCore/runtime


Ignore:
Timestamp:
Jan 5, 2010, 12:58:28 AM (15 years ago)
Author:
[email protected]
Message:

2010-01-04 Maciej Stachowiak <​[email protected]>

Reviewed by Darin Fisher.

Reorganize, document and rename OS() platform macros.
​https://bugs.webkit.org/show_bug.cgi?id=33198

  • wtf/Platform.h: Rename, reorganize and document OS() macros.

Adapt to name changes. Also fixed a few incorrect OS checks.

  • API/JSContextRef.cpp:
  • assembler/MacroAssemblerARM.cpp: (JSC::isVFPPresent):
  • assembler/MacroAssemblerX86Common.h:
  • bytecode/SamplingTool.cpp:
  • config.h:
  • interpreter/RegisterFile.cpp: (JSC::RegisterFile::~RegisterFile):
  • interpreter/RegisterFile.h: (JSC::RegisterFile::RegisterFile): (JSC::RegisterFile::grow):
  • jit/ExecutableAllocator.h:
  • jit/ExecutableAllocatorFixedVMPool.cpp:
  • jit/ExecutableAllocatorPosix.cpp:
  • jit/ExecutableAllocatorSymbian.cpp:
  • jit/ExecutableAllocatorWin.cpp:
  • jit/JITOpcodes.cpp: (JSC::JIT::privateCompileCTIMachineTrampolines):
  • jit/JITStubs.cpp:
  • jsc.cpp: (main):
  • parser/Grammar.y:
  • profiler/ProfileNode.cpp: (JSC::getCount):
  • runtime/Collector.cpp: (JSC::Heap::Heap): (JSC::Heap::allocateBlock): (JSC::Heap::freeBlockPtr): (JSC::currentThreadStackBase): (JSC::getCurrentPlatformThread): (JSC::suspendThread): (JSC::resumeThread): (JSC::getPlatformThreadRegisters): (JSC::otherThreadStackPointer):
  • runtime/Collector.h:
  • runtime/DateConstructor.cpp:
  • runtime/DatePrototype.cpp: (JSC::formatLocaleDate):
  • runtime/InitializeThreading.cpp: (JSC::initializeThreading):
  • runtime/MarkStack.h: (JSC::MarkStack::MarkStackArray::shrinkAllocation):
  • runtime/MarkStackPosix.cpp:
  • runtime/MarkStackSymbian.cpp:
  • runtime/MarkStackWin.cpp:
  • runtime/StringPrototype.cpp: (JSC::stringProtoFuncLastIndexOf):
  • runtime/TimeoutChecker.cpp: (JSC::getCPUTime):
  • runtime/UString.cpp: (JSC::UString::from):
  • wtf/Assertions.cpp:
  • wtf/Assertions.h:
  • wtf/CurrentTime.cpp: (WTF::lowResUTCTime):
  • wtf/CurrentTime.h: (WTF::getLocalTime):
  • wtf/DateMath.cpp:
  • wtf/FastMalloc.cpp: (WTF::TCMalloc_ThreadCache::InitModule): (WTF::TCMallocStats::):
  • wtf/FastMalloc.h:
  • wtf/MathExtras.h:
  • wtf/RandomNumber.cpp: (WTF::randomNumber):
  • wtf/RandomNumberSeed.h: (WTF::initializeRandomNumberGenerator):
  • wtf/StringExtras.h:
  • wtf/TCSpinLock.h: (TCMalloc_SpinLock::Unlock): (TCMalloc_SlowLock):
  • wtf/TCSystemAlloc.cpp:
  • wtf/ThreadSpecific.h: (WTF::::destroy):
  • wtf/Threading.h:
  • wtf/ThreadingPthreads.cpp: (WTF::initializeThreading): (WTF::isMainThread):
  • wtf/ThreadingWin.cpp: (WTF::wtfThreadEntryPoint): (WTF::createThreadInternal):
  • wtf/VMTags.h:
  • wtf/unicode/icu/CollatorICU.cpp: (WTF::Collator::userDefault):
  • wtf/win/MainThreadWin.cpp: (WTF::initializeMainThreadPlatform):

2010-01-04 Maciej Stachowiak <​[email protected]>

Reviewed by Darin Fisher.

Reorganize, document and rename OS() platform macros.
​https://bugs.webkit.org/show_bug.cgi?id=33198

Adapt to name changes.

  • src/ChromiumBridge.cpp:
  • src/EditorClientImpl.cpp: (WebKit::EditorClientImpl::isSelectTrailingWhitespaceEnabled): (WebKit::): (WebKit::EditorClientImpl::handleEditingKeyboardEvent):
  • src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::createPlugin):
  • src/GraphicsContext3D.cpp: (WebCore::GraphicsContext3DInternal::GraphicsContext3DInternal): (WebCore::GraphicsContext3DInternal::~GraphicsContext3DInternal): (WebCore::GraphicsContext3DInternal::makeContextCurrent):
  • src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::selectionAsText): (WebKit::WebFrameImpl::printPage):
  • src/WebPluginContainerImpl.cpp: (WebKit::WebPluginContainerImpl::handleMouseEvent): (WebKit::WebPluginContainerImpl::handleKeyboardEvent):
  • src/WebViewImpl.cpp: (WebKit::WebViewImpl::mouseDown): (WebKit::WebViewImpl::mouseContextMenu): (WebKit::WebViewImpl::mouseUp): (WebKit::WebViewImpl::keyEvent): (WebKit::WebViewImpl::sendContextMenuEvent): (WebKit::WebViewImpl::setScrollbarColors): (WebKit::WebViewImpl::navigationPolicyFromMouseEvent):

2010-01-04 Maciej Stachowiak <​[email protected]>

Reviewed by Darin Fisher.

Reorganize, document and rename OS() platform macros.
​https://bugs.webkit.org/show_bug.cgi?id=33198

Adapt to name changes.

  • webkit/webkitwebsettings.cpp: (webkit_get_user_agent):

2010-01-04 Maciej Stachowiak <​[email protected]>

Reviewed by Darin Fisher.

Reorganize, document and rename OS() platform macros.
​https://bugs.webkit.org/show_bug.cgi?id=33198

Adapt to name changes. Also fixed a few incorrect OS checks.

  • accessibility/AccessibilityObject.h:
  • config.h:
  • dom/SelectElement.cpp: (WebCore::SelectElement::listBoxDefaultEventHandler):
  • inspector/InspectorFrontendHost.cpp: (WebCore::InspectorFrontendHost::platform):
  • loader/CachedFont.cpp:
  • loader/FTPDirectoryDocument.cpp:
  • loader/FTPDirectoryParser.cpp:
  • page/EventHandler.cpp:
  • page/Frame.cpp: (WebCore::Frame::setUseSecureKeyboardEntry):
  • page/NavigatorBase.cpp: (WebCore::NavigatorBase::platform):
  • page/Page.h:
  • page/Settings.cpp: (WebCore::Settings::Settings):
  • page/Settings.h:
  • page/chromium/DragControllerChromium.cpp: (WebCore::DragController::isCopyKeyDown):
  • page/chromium/EventHandlerChromium.cpp: (WebCore::EventHandler::accessKeyModifiers):
  • page/win/EventHandlerWin.cpp: (WebCore::EventHandler::createDraggingClipboard):
  • platform/FileSystem.h:
  • platform/KeyboardCodes.h:
  • platform/PurgeableBuffer.h:
  • platform/chromium/ChromiumBridge.h:
  • platform/chromium/ClipboardChromium.cpp: (WebCore::ClipboardChromium::writeRange):
  • platform/chromium/ClipboardUtilitiesChromium.cpp:
  • platform/chromium/ClipboardUtilitiesChromium.h:
  • platform/chromium/PasteboardChromium.cpp: (WebCore::Pasteboard::writeSelection): (WebCore::Pasteboard::writePlainText): (WebCore::Pasteboard::documentFragment):
  • platform/chromium/PlatformKeyboardEventChromium.cpp: (WebCore::PlatformKeyboardEvent::disambiguateKeyDownEvent): (WebCore::PlatformKeyboardEvent::currentCapsLockState):
  • platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupListBox::layout): (WebCore::PopupMenu::show):
  • platform/graphics/BitmapImage.h: (WebCore::BitmapImage::mayFillWithSolidColor):
  • platform/graphics/FloatPoint.h:
  • platform/graphics/FloatRect.h:
  • platform/graphics/FloatSize.h:
  • platform/graphics/FontCache.cpp: (WebCore::alternateFamilyName):
  • platform/graphics/FontCache.h:
  • platform/graphics/FontFastPath.cpp: (WebCore::Font::glyphDataForCharacter):
  • platform/graphics/GlyphBuffer.h: (WebCore::GlyphBuffer::advanceAt): (WebCore::GlyphBuffer::add):
  • platform/graphics/Gradient.h:
  • platform/graphics/GraphicsContext.cpp:
  • platform/graphics/GraphicsContext.h:
  • platform/graphics/GraphicsContext3D.h:
  • platform/graphics/ImageSource.h:
  • platform/graphics/IntRect.h:
  • platform/graphics/MediaPlayer.cpp:
  • platform/graphics/Path.h:
  • platform/graphics/Pattern.h:
  • platform/graphics/SimpleFontData.h:
  • platform/graphics/cg/ColorCG.cpp:
  • platform/graphics/cg/GraphicsContextCG.cpp:
  • platform/graphics/chromium/FontCustomPlatformData.cpp: (WebCore::FontCustomPlatformData::~FontCustomPlatformData): (WebCore::FontCustomPlatformData::fontPlatformData): (WebCore::createFontCustomPlatformData):
  • platform/graphics/chromium/FontCustomPlatformData.h:
  • platform/graphics/chromium/FontPlatformData.h:
  • platform/graphics/opentype/OpenTypeUtilities.cpp:
  • platform/graphics/opentype/OpenTypeUtilities.h:
  • platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::getWindowsContext):
  • platform/graphics/qt/ImageQt.cpp:
  • platform/graphics/skia/GraphicsContextSkia.cpp: (WebCore::GraphicsContext::clipToImageBuffer):
  • platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::ImageBuffer::ImageBuffer):
  • platform/graphics/skia/PlatformContextSkia.cpp: (PlatformContextSkia::State::State): (PlatformContextSkia::PlatformContextSkia): (PlatformContextSkia::save): (PlatformContextSkia::restore):
  • platform/graphics/skia/PlatformContextSkia.h:
  • platform/graphics/win/IconWin.cpp: (WebCore::Icon::createIconForFiles): (WebCore::Icon::paint):
  • platform/graphics/wx/GraphicsContextWx.cpp:
  • platform/gtk/FileSystemGtk.cpp: (WebCore::filenameToString): (WebCore::filenameFromString): (WebCore::filenameForDisplay):
  • platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
  • platform/network/curl/ResourceHandleManager.cpp:
  • platform/network/soup/ResourceHandleSoup.cpp: (WebCore::):
  • platform/text/String.cpp: (WebCore::String::format): (WebCore::String::number):
  • platform/text/TextEncoding.cpp: (WebCore::TextEncoding::encode):
  • platform/text/TextEncodingRegistry.cpp: (WebCore::buildBaseTextCodecMaps): (WebCore::extendTextCodecMaps):
  • platform/text/TextStream.cpp:
  • platform/text/TextStream.h:
  • platform/text/qt/TextCodecQt.cpp: (WebCore::TextCodecQt::decode):
  • platform/win/PlatformMouseEventWin.cpp: (WebCore::messageToEventType): (WebCore::PlatformMouseEvent::PlatformMouseEvent):
  • platform/win/PlatformScreenWin.cpp: (WebCore::deviceInfoForWidget): (WebCore::screenIsMonochrome):
  • platform/win/PopupMenuWin.cpp: (WebCore::PopupMenu::show): (WebCore::PopupMenu::paint): (WebCore::PopupMenu::registerClass): (WebCore::PopupMenu::PopupMenuWndProc): (WebCore::PopupMenu::wndProc):
  • platform/win/SystemTimeWin.cpp: (WebCore::userIdleTime):
  • platform/wx/FileSystemWx.cpp: (WebCore::unloadModule):
  • plugins/PluginDatabase.cpp:
  • plugins/PluginPackage.cpp: (WebCore::PluginPackage::compareFileVersion):
  • plugins/PluginPackage.h:
  • plugins/PluginView.cpp: (WebCore::PluginView::setFrameRect): (WebCore::PluginView::stop): (WebCore::PluginView::PluginView):
  • plugins/PluginView.h:
  • plugins/win/PluginDatabaseWin.cpp: (WebCore::addWindowsMediaPlayerPluginDirectory): (WebCore::addMacromediaPluginDirectories):
  • plugins/win/PluginPackageWin.cpp: (WebCore::PluginPackage::load):
  • plugins/win/PluginViewWin.cpp: (WebCore::registerPluginView): (WebCore::PluginView::wndProc): (WebCore::PluginView::updatePluginWidget): (WebCore::PluginView::paintIntoTransformedContext): (WebCore::PluginView::paintWindowedPluginIntoContext): (WebCore::PluginView::paint): (WebCore::PluginView::handleMouseEvent): (WebCore::PluginView::setParent): (WebCore::PluginView::setNPWindowRect): (WebCore::PluginView::platformStart):

2010-01-04 Maciej Stachowiak <​[email protected]>

Reviewed by Darin Fisher.

Reorganize, document and rename OS() platform macros.
​https://bugs.webkit.org/show_bug.cgi?id=33198

Adapt to name changes.


  • DumpRenderTree/DumpRenderTree.h:
  • DumpRenderTree/config.h:
Location:
trunk/JavaScriptCore/runtime
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/runtime/Collector.cpp

    r52729 r52791  
    4646#include <wtf/VMTags.h>
    4747
    48 #if PLATFORM(DARWIN)
     48#if OS(DARWIN)
    4949
    5050#include <mach/mach_init.h>
    … …  
    5454#include <mach/vm_map.h>
    5555
    56 #elif PLATFORM(SYMBIAN)
     56#elif OS(SYMBIAN)
    5757#include <e32std.h>
    5858#include <e32cmn.h>
    5959#include <unistd.h>
    6060
    61 #elif PLATFORM(WIN_OS)
     61#elif OS(WINDOWS)
    6262
    6363#include <windows.h>
    6464#include <malloc.h>
    6565
    66 #elif PLATFORM(HAIKU)
     66#elif OS(HAIKU)
    6767
    6868#include <OS.h>
    6969
    70 #elif PLATFORM(UNIX)
     70#elif OS(UNIX)
    7171
    7272#include <stdlib.h>
    73 #if !PLATFORM(HAIKU)
     73#if !OS(HAIKU)
    7474#include <sys/mman.h>
    7575#endif
    7676#include <unistd.h>
    7777
    78 #if PLATFORM(SOLARIS)
     78#if OS(SOLARIS)
    7979#include <thread.h>
    8080#else
    … …  
    8686#endif
    8787
    88 #if PLATFORM(QNX)
     88#if OS(QNX)
    8989#include <fcntl.h>
    9090#include <sys/procfs.h>
    … …  
    110110#define MIN_ARRAY_SIZE (static_cast<size_t>(14))
    111111
    112 #if PLATFORM(SYMBIAN)
     112#if OS(SYMBIAN)
    113113const size_t MAX_NUM_BLOCKS = 256; // Max size of collector heap set to 16 MB
    114114static RHeap* userChunk = 0;
    … …  
    117117#if ENABLE(JSC_MULTIPLE_THREADS)
    118118
    119 #if PLATFORM(DARWIN)
     119#if OS(DARWIN)
    120120typedef mach_port_t PlatformThread;
    121 #elif PLATFORM(WIN_OS)
     121#elif OS(WINDOWS)
    122122typedef HANDLE PlatformThread;
    123123#endif
    … …  
    150150    ASSERT(globalData);
    151151   
    152 #if PLATFORM(SYMBIAN)
     152#if OS(SYMBIAN)
    153153    // Symbian OpenC supports mmap but currently not the MAP_ANON flag.
    154154    // Using fastMalloc() does not properly align blocks on 64k boundaries
    … …  
    168168            CRASH();
    169169    }
    170 #endif // PLATFORM(SYMBIAN)
     170#endif // OS(SYMBIAN)
    171171   
    172172    memset(&m_heap, 0, sizeof(CollectorHeap));
    … …  
    215215NEVER_INLINE CollectorBlock* Heap::allocateBlock()
    216216{
    217 #if PLATFORM(DARWIN)
     217#if OS(DARWIN)
    218218    vm_address_t address = 0;
    219219    vm_map(current_task(), &address, BLOCK_SIZE, BLOCK_OFFSET_MASK, VM_FLAGS_ANYWHERE | VM_TAG_FOR_COLLECTOR_MEMORY, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, VM_INHERIT_DEFAULT);
    220 #elif PLATFORM(SYMBIAN)
     220#elif OS(SYMBIAN)
    221221    // Allocate a 64 kb aligned CollectorBlock
    222222    unsigned char* mask = reinterpret_cast<unsigned char*>(userChunk->Alloc(BLOCK_SIZE));
    … …  
    224224        CRASH();
    225225    uintptr_t address = reinterpret_cast<uintptr_t>(mask);
    226 #elif PLATFORM(WINCE)
     226#elif OS(WINCE)
    227227    void* address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
    228 #elif PLATFORM(WIN_OS)
     228#elif OS(WINDOWS)
    229229#if COMPILER(MINGW)
    230230    void* address = __mingw_aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
    … …  
    309309NEVER_INLINE void Heap::freeBlockPtr(CollectorBlock* block)
    310310{
    311 #if PLATFORM(DARWIN)   
     311#if OS(DARWIN)   
    312312    vm_deallocate(current_task(), reinterpret_cast<vm_address_t>(block), BLOCK_SIZE);
    313 #elif PLATFORM(SYMBIAN)
     313#elif OS(SYMBIAN)
    314314    userChunk->Free(reinterpret_cast<TAny*>(block));
    315 #elif PLATFORM(WINCE)
     315#elif OS(WINCE)
    316316    VirtualFree(block, 0, MEM_RELEASE);
    317 #elif PLATFORM(WIN_OS)
     317#elif OS(WINDOWS)
    318318#if COMPILER(MINGW)
    319319    __mingw_aligned_free(block);
    … …  
    451451}
    452452
    453 #if PLATFORM(WINCE)
     453#if OS(WINCE)
    454454void* g_stackBase = 0;
    455455
    … …  
    508508#endif
    509509
    510 #if PLATFORM(QNX)
     510#if OS(QNX)
    511511static inline void *currentThreadStackBaseQNX()
    512512{
    … …  
    537537static inline void* currentThreadStackBase()
    538538{
    539 #if PLATFORM(DARWIN)
     539#if OS(DARWIN)
    540540    pthread_t thread = pthread_self();
    541541    return pthread_get_stackaddr_np(thread);
    542 #elif PLATFORM(WIN_OS) && CPU(X86) && COMPILER(MSVC)
     542#elif OS(WINDOWS) && CPU(X86) && COMPILER(MSVC)
    543543    // offset 0x18 from the FS segment register gives a pointer to
    544544    // the thread information block for the current thread
    … …  
    549549    }
    550550    return static_cast<void*>(pTib->StackBase);
    551 #elif PLATFORM(WIN_OS) && CPU(X86_64) && COMPILER(MSVC)
     551#elif OS(WINDOWS) && CPU(X86_64) && COMPILER(MSVC)
     552    // FIXME: why only for MSVC?
    552553    PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
    553554    return reinterpret_cast<void*>(pTib->StackBase);
    554 #elif PLATFORM(WIN_OS) && CPU(X86) && COMPILER(GCC)
     555#elif OS(WINDOWS) && CPU(X86) && COMPILER(GCC)
    555556    // offset 0x18 from the FS segment register gives a pointer to
    556557    // the thread information block for the current thread
    … …  
    560561        );
    561562    return static_cast<void*>(pTib->StackBase);
    562 #elif PLATFORM(QNX)
     563#elif OS(QNX)
    563564    return currentThreadStackBaseQNX();
    564 #elif PLATFORM(SOLARIS)
     565#elif OS(SOLARIS)
    565566    stack_t s;
    566567    thr_stksegment(&s);
    567568    return s.ss_sp;
    568 #elif PLATFORM(OPENBSD)
     569#elif OS(OPENBSD)
    569570    pthread_t thread = pthread_self();
    570571    stack_t stack;
    571572    pthread_stackseg_np(thread, &stack);
    572573    return stack.ss_sp;
    573 #elif PLATFORM(SYMBIAN)
     574#elif OS(SYMBIAN)
    574575    static void* stackBase = 0;
    575576    if (stackBase == 0) {
    … …  
    580581    }
    581582    return (void*)stackBase;
    582 #elif PLATFORM(HAIKU)
     583#elif OS(HAIKU)
    583584    thread_info threadInfo;
    584585    get_thread_info(find_thread(NULL), &threadInfo);
    585586    return threadInfo.stack_end;
    586 #elif PLATFORM(UNIX)
     587#elif OS(UNIX)
    587588    static void* stackBase = 0;
    588589    static size_t stackSize = 0;
    … …  
    592593        pthread_attr_t sattr;
    593594        pthread_attr_init(&sattr);
    594 #if HAVE(PTHREAD_NP_H) || PLATFORM(NETBSD)
     595#if HAVE(PTHREAD_NP_H) || OS(NETBSD)
    595596        // e.g. on FreeBSD 5.4, [email protected]
    596597        pthread_attr_get_np(thread, &sattr);
    … …  
    606607    }
    607608    return static_cast<char*>(stackBase) + stackSize;
    608 #elif PLATFORM(WINCE)
     609#elif OS(WINCE)
    609610    if (g_stackBase)
    610611        return g_stackBase;
    … …  
    622623static inline PlatformThread getCurrentPlatformThread()
    623624{
    624 #if PLATFORM(DARWIN)
     625#if OS(DARWIN)
    625626    return pthread_mach_thread_np(pthread_self());
    626 #elif PLATFORM(WIN_OS)
     627#elif OS(WINDOWS)
    627628    return pthread_getw32threadhandle_np(pthread_self());
    628629#endif
    … …  
    800801static inline void suspendThread(const PlatformThread& platformThread)
    801802{
    802 #if PLATFORM(DARWIN)
     803#if OS(DARWIN)
    803804    thread_suspend(platformThread);
    804 #elif PLATFORM(WIN_OS)
     805#elif OS(WINDOWS)
    805806    SuspendThread(platformThread);
    806807#else
    … …  
    811812static inline void resumeThread(const PlatformThread& platformThread)
    812813{
    813 #if PLATFORM(DARWIN)
     814#if OS(DARWIN)
    814815    thread_resume(platformThread);
    815 #elif PLATFORM(WIN_OS)
     816#elif OS(WINDOWS)
    816817    ResumeThread(platformThread);
    817818#else
    … …  
    822823typedef unsigned long usword_t; // word size, assumed to be either 32 or 64 bit
    823824
    824 #if PLATFORM(DARWIN)
     825#if OS(DARWIN)
    825826
    826827#if CPU(X86)
    … …  
    838839#endif
    839840
    840 #elif PLATFORM(WIN_OS)&& CPU(X86)
     841#elif OS(WINDOWS) && CPU(X86)
    841842typedef CONTEXT PlatformThreadRegisters;
    842843#else
    … …  
    846847static size_t getPlatformThreadRegisters(const PlatformThread& platformThread, PlatformThreadRegisters& regs)
    847848{
    848 #if PLATFORM(DARWIN)
     849#if OS(DARWIN)
    849850
    850851#if CPU(X86)
    … …  
    874875    }
    875876    return user_count * sizeof(usword_t);
    876 // end PLATFORM(DARWIN)
    877 
    878 #elif PLATFORM(WIN_OS) && CPU(X86)
     877// end OS(DARWIN)
     878
     879#elif OS(WINDOWS) && CPU(X86)
    879880    regs.ContextFlags = CONTEXT_INTEGER | CONTEXT_CONTROL | CONTEXT_SEGMENTS;
    880881    GetThreadContext(platformThread, &regs);
    … …  
    887888static inline void* otherThreadStackPointer(const PlatformThreadRegisters& regs)
    888889{
    889 #if PLATFORM(DARWIN)
     890#if OS(DARWIN)
    890891
    891892#if __DARWIN_UNIX03
    … …  
    917918#endif // __DARWIN_UNIX03
    918919
    919 // end PLATFORM(DARWIN)
    920 #elif CPU(X86) && PLATFORM(WIN_OS)
     920// end OS(DARWIN)
     921#elif CPU(X86) && OS(WINDOWS)
    921922    return reinterpret_cast<void*>((uintptr_t) regs.Esp);
    922923#else

  • trunk/JavaScriptCore/runtime/Collector.h

    r52176 r52791  
    182182    template<> struct CellSize<sizeof(uint64_t)> { static const size_t m_value = 64; };
    183183
    184 #if PLATFORM(WINCE) || PLATFORM(SYMBIAN)
     184#if OS(WINCE) || OS(SYMBIAN)
    185185    const size_t BLOCK_SIZE = 64 * 1024; // 64k
    186186#else

  • trunk/JavaScriptCore/runtime/DateConstructor.cpp

    r52028 r52791  
    3636#include <wtf/MathExtras.h>
    3737
    38 #if PLATFORM(WINCE) && !PLATFORM(QT)
     38#if OS(WINCE) && !PLATFORM(QT)
    3939extern "C" time_t time(time_t* timer); // Provided by libce.
    4040#endif

  • trunk/JavaScriptCore/runtime/DatePrototype.cpp

    r52028 r52791  
    6060#endif
    6161
    62 #if PLATFORM(WINCE) && !PLATFORM(QT)
     62#if OS(WINCE) && !PLATFORM(QT)
    6363extern "C" size_t strftime(char * const s, const size_t maxsize, const char * const format, const struct tm * const t); //provided by libce
    6464#endif
    … …  
    198198#if HAVE(LANGINFO_H)
    199199    static const nl_item formats[] = { D_T_FMT, D_FMT, T_FMT };
    200 #elif (PLATFORM(WINCE) && !PLATFORM(QT)) || PLATFORM(SYMBIAN)
     200#elif (OS(WINCE) && !PLATFORM(QT)) || OS(SYMBIAN)
    201201     // strftime() does not support '#' on WinCE or Symbian
    202202    static const char* const formatStrings[] = { "%c", "%x", "%X" };

  • trunk/JavaScriptCore/runtime/InitializeThreading.cpp

    r50608 r52791  
    4242namespace JSC {
    4343
    44 #if PLATFORM(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
     44#if OS(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
    4545static pthread_once_t initializeThreadingKeyOnce = PTHREAD_ONCE_INIT;
    4646#endif
    … …  
    5858void initializeThreading()
    5959{
    60 #if PLATFORM(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
     60#if OS(DARWIN) && ENABLE(JSC_MULTIPLE_THREADS)
    6161    pthread_once(&initializeThreadingKeyOnce, initializeThreadingOnce);
    6262#else

  • trunk/JavaScriptCore/runtime/MarkStack.h

    r51461 r52791  
    154154                if (size == m_allocated)
    155155                    return;
    156 #if PLATFORM(WIN_OS) || PLATFORM(SYMBIAN)
     156#if OS(WINDOWS) || OS(SYMBIAN)
    157157                // We cannot release a part of a region with VirtualFree.  To get around this,
    158158                // we'll release the entire region and reallocate the size that we want.

  • trunk/JavaScriptCore/runtime/MarkStackPosix.cpp

    r52355 r52791  
    2727#include "MarkStack.h"
    2828
    29 #if PLATFORM(UNIX) && !PLATFORM(SYMBIAN)
     29#if OS(UNIX) && !OS(SYMBIAN)
    3030
    3131#include <unistd.h>

  • trunk/JavaScriptCore/runtime/MarkStackSymbian.cpp

    r52355 r52791  
    2121#include "MarkStack.h"
    2222
    23 #if PLATFORM(SYMBIAN)
     23#if OS(SYMBIAN)
    2424
    2525#include <e32hal.h>

  • trunk/JavaScriptCore/runtime/MarkStackWin.cpp

    r52355 r52791  
    2727#include "MarkStack.h"
    2828
    29 #if PLATFORM(WIN_OS)
     29#if OS(WINDOWS)
    3030
    3131#include "windows.h"

  • trunk/JavaScriptCore/runtime/StringPrototype.cpp

    r52346 r52791  
    480480    else if (!(dpos <= len)) // true for NaN
    481481        dpos = len;
    482 #if PLATFORM(SYMBIAN)
     482#if OS(SYMBIAN)
    483483    // Work around for broken NaN compare operator
    484484    else if (isnan(dpos))

  • trunk/JavaScriptCore/runtime/TimeoutChecker.cpp

    r48736 r52791  
    3434#include "JSGlobalObject.h"
    3535
    36 #if PLATFORM(DARWIN)
     36#if OS(DARWIN)
    3737#include <mach/mach.h>
    38 #elif PLATFORM(WIN_OS)
     38#elif OS(WINDOWS)
    3939#include <windows.h>
    4040#else
    … …  
    5555static inline unsigned getCPUTime()
    5656{
    57 #if PLATFORM(DARWIN)
     57#if OS(DARWIN)
    5858    mach_msg_type_number_t infoCount = THREAD_BASIC_INFO_COUNT;
    5959    thread_basic_info_data_t info;
    … …  
    6868   
    6969    return time;
    70 #elif PLATFORM(WIN_OS)
     70#elif OS(WINDOWS)
    7171    union {
    7272        FILETIME fileTime;

  • trunk/JavaScriptCore/runtime/UString.cpp

    r52463 r52791  
    290290    else if (i == std::numeric_limits<long long>::min()) {
    291291        char minBuf[1 + sizeof(i) * 3];
    292 #if PLATFORM(WIN_OS)
     292#if OS(WINDOWS)
    293293        snprintf(minBuf, sizeof(minBuf) - 1, "%I64d", std::numeric_limits<long long>::min());
    294294#else
Note: See TracChangeset for help on using the changeset viewer.