Show
Ignore:
Timestamp:
07/18/08 14:43:08 (2 years ago)
Author:
mbensi
Message:

merge with webkit revision 35231

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/kjs/DateMath.cpp

    r370 r402  
    310310void getLocalTime(const time_t* localTime, struct tm* localTM) 
    311311{ 
    312 #if PLATFORM(QT) 
    313 #if USE(MULTIPLE_THREADS) 
    314 #error Mulitple threads are currently not supported in the Qt/mingw build 
    315 #endif 
     312#if COMPILER(MSVC7) || COMPILER(MINGW) 
    316313    *localTM = *localtime(localTime); 
    317 #elif PLATFORM(WIN_OS) 
    318     #if COMPILER(MSVC7) 
    319     *localTM = *localtime(localTime); 
    320     #else 
     314#elif COMPILER(MSVC) 
    321315    localtime_s(localTM, localTime); 
    322     #endif 
    323316#else 
    324317    localtime_r(localTime, localTM);