Changeset 141263 in webkit


Ignore:
Timestamp:
Jan 30, 2013 6:48:40 AM (11 years ago)
Author:
zeno.albisser@digia.com
Message:

[Qt] Fix Qt/Mac build after r141024 and r141037
​https://bugs.webkit.org/show_bug.cgi?id=108318

Reviewed by Kentaro Hara.

Source/WebKit2:

  • Platform/CoreIPC/mac/ConnectionMac.cpp:

(CoreIPC::Connection::platformInvalidate):

Replace nullptr with 0 to allow compiling without C++11 support.

Source/WTF:

  • wtf/Functional.h:

Make sure Block.h is included and its functionality
is enabled for Qt on Mac.

Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r141255 r141263  
     12013-01-30  Zeno Albisser  <zeno@webkit.org>
     2
     3        [Qt] Fix Qt/Mac build after r141024 and r141037
     4        https://bugs.webkit.org/show_bug.cgi?id=108318
     5
     6        Reviewed by Kentaro Hara.
     7
     8        * wtf/Functional.h:
     9            Make sure Block.h is included and its functionality
     10            is enabled for Qt on Mac.
     11
    1122013-01-30  Simon Hausmann  <simon.hausmann@digia.com>
    213

  • trunk/Source/WTF/wtf/Functional.h

    r140857 r141263  
    3333#include <wtf/WeakPtr.h>
    3434
    35 #if PLATFORM(MAC) && COMPILER_SUPPORTS(BLOCKS)
     35#if OS(DARWIN) && COMPILER_SUPPORTS(BLOCKS)
    3636#include <Block.h>
    3737#include <wtf/ObjcRuntimeExtras.h>
    … …  
    371371};
    372372
    373 #if PLATFORM(MAC) && COMPILER_SUPPORTS(BLOCKS)
     373#if OS(DARWIN) && COMPILER_SUPPORTS(BLOCKS)
    374374template<typename R>
    375375class FunctionWrapper<R (^)()> {
    … …  
    705705    }
    706706
    707 #if PLATFORM(MAC) && COMPILER_SUPPORTS(BLOCKS)
     707#if OS(DARWIN) && COMPILER_SUPPORTS(BLOCKS)
    708708    typedef void (^BlockType)();
    709709    operator BlockType() const

  • trunk/Source/WebKit2/ChangeLog

    r141247 r141263  
     12013-01-30  Zeno Albisser  <zeno@webkit.org>
     2
     3        [Qt] Fix Qt/Mac build after r141024 and r141037
     4        https://bugs.webkit.org/show_bug.cgi?id=108318
     5
     6        Reviewed by Kentaro Hara.
     7
     8        * Platform/CoreIPC/mac/ConnectionMac.cpp:
     9        (CoreIPC::Connection::platformInvalidate):
     10            Replace nullptr with 0 to allow compiling without C++11 support.
     11
    1122013-01-30  Kondapally Kalyan  <kalyan.kondapally@intel.com>
    213

  • trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp

    r141191 r141263  
    6262    dispatch_source_cancel(m_deadNameSource);
    6363    dispatch_release(m_deadNameSource);
    64     m_deadNameSource = nullptr;
     64    m_deadNameSource = 0;
    6565    m_sendPort = MACH_PORT_NULL;
    6666
    6767    dispatch_source_cancel(m_receivePortDataAvailableSource);
    6868    dispatch_release(m_receivePortDataAvailableSource);
    69     m_receivePortDataAvailableSource = nullptr;
     69    m_receivePortDataAvailableSource = 0;
    7070    m_receivePort = MACH_PORT_NULL;
    7171
    … …  
    7373        dispatch_source_cancel(m_exceptionPortDataAvailableSource);
    7474        dispatch_release(m_exceptionPortDataAvailableSource);
    75         m_exceptionPortDataAvailableSource = nullptr;
     75        m_exceptionPortDataAvailableSource = 0;
    7676        m_exceptionPort = MACH_PORT_NULL;
    7777    }
    … …  
    8080    if (m_xpcConnection) {
    8181        xpc_release(m_xpcConnection);
    82         m_xpcConnection = nullptr;
     82        m_xpcConnection = 0;
    8383    }
    8484#endif
Note: See TracChangeset for help on using the changeset viewer.