Changeset 73106 in webkit


Ignore:
Timestamp:
Dec 1, 2010 8:04:55 PM (13 years ago)
Author:
ggaren@apple.com
Message:

Try to fix the Qt build: Include all OS files for Qt's sake, and then
use #ifdefs in the files to exclude things based on OS.

This is a pretty bad way to manage platforms -- hopefully we can
fix the Qt build system and move away from this in the future.

  • wtf/OSAllocatorPosix.cpp:
  • wtf/OSAllocatorSymbian.cpp:
  • wtf/OSAllocatorWin.cpp:
  • wtf/wtf.pri:
Location:
trunk/JavaScriptCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r73105 r73106  
     12010-12-01  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Try to fix the Qt build: Include all OS files for Qt's sake, and then
     4        use #ifdefs in the files to exclude things based on OS.
     5       
     6        This is a pretty bad way to manage platforms -- hopefully we can
     7        fix the Qt build system and move away from this in the future.
     8
     9        * wtf/OSAllocatorPosix.cpp:
     10        * wtf/OSAllocatorSymbian.cpp:
     11        * wtf/OSAllocatorWin.cpp:
     12        * wtf/wtf.pri:
     13
    1142010-12-01  Geoffrey Garen  <ggaren@apple.com>
    215
  • trunk/JavaScriptCore/wtf/OSAllocatorPosix.cpp

    r73101 r73106  
    2626#include "config.h"
    2727#include "OSAllocator.h"
     28
     29#if OS(UNIX) && !OS(SYMBIAN)
    2830
    2931#include <errno.h>
     
    8284
    8385} // namespace WTF
     86
     87#endif
  • trunk/JavaScriptCore/wtf/OSAllocatorSymbian.cpp

    r73091 r73106  
    2626#include "config.h"
    2727#include "OSAllocator.h"
     28
     29#if OS(SYMBIAN)
    2830
    2931#include <wtf/FastMalloc.h>
     
    5557
    5658} // namespace WTF
     59
     60#endif
  • trunk/JavaScriptCore/wtf/OSAllocatorWin.cpp

    r73096 r73106  
    2626#include "config.h"
    2727#include "OSAllocator.h"
     28
     29#if OS(WINDOWS)
    2830
    2931#include "windows.h"
     
    5961
    6062} // namespace WTF
     63
     64#endif
  • trunk/JavaScriptCore/wtf/wtf.pri

    r73097 r73106  
    1515    wtf/MainThread.cpp \
    1616    wtf/OSAllocatorPosix.cpp \
     17    wtf/OSAllocatorSymbian.cpp \
     18    wtf/OSAllocatorWin.cpp \
    1719    wtf/qt/MainThreadQt.cpp \
    1820    wtf/qt/StringQt.cpp \
Note: See TracChangeset for help on using the changeset viewer.