Changeset 39335 in webkit


Ignore:
Timestamp:
Dec 16, 2008 8:02:46 AM (15 years ago)
Author:
vestbo@webkit.org
Message:

2008-12-16 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Tor Arne Vestbø.

Qt/Win build fix

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r39332 r39335  
     12008-12-16 Yael Aharon <yael.aharon@nokia.com>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        Qt/Win build fix
     6
     7        * JavaScriptCore.pri:
     8
    192008-12-15  Mark Rowe  <mrowe@apple.com>
    210

  • trunk/JavaScriptCore/JavaScriptCore.pri

    r39229 r39335  
    99isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = tmp
    1010GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR/
    11 win32-*: GENERATED_SOURCES_DIR_SLASH ~= s|/|\|
    12 win32-g++: LIBS += -lwinmm
    13 
     11win32-* {
     12    GENERATED_SOURCES_DIR_SLASH ~= s|/|\|
     13    LIBS += -lwinmm
     14}
    1415
    1516# Disable the JIT due to numerous observed miscompilations :(

  • trunk/WebCore/ChangeLog

    r39334 r39335  
     12008-12-16 Yael Aharon <yael.aharon@nokia.com>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        Qt/Win build fix
     6
     7        * platform/win/SystemTimeWin.cpp:
     8
    192008-12-16  Kalle Vahlman  <kalle.vahlman@movial.com>
    210

  • trunk/WebCore/platform/win/SystemTimeWin.cpp

    r38618 r39335  
    3030#include <windows.h>
    3131
    32 #if COMPILER(MINGW)
     32#if COMPILER(MINGW) || (PLATFORM(QT) && COMPILER(MSVC))
    3333#include <float.h>
    3434#define FLOAT_MAX FLT_MAX
Note: See TracChangeset for help on using the changeset viewer.