diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-06-16 19:56:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-06-16 19:56:35 +0200 |
| commit | 8b24887dcb8e9ea1fd1b4043795a54bb3d6d3663 (patch) | |
| tree | cc0d0a41dfd79929f0ee8c196b0a5d58ac35bfe7 | |
| parent | 052e65994595144eb1dcc729e3584e1b56f07cd0 (diff) | |
| parent | 09957b3f77fccf3dfacdc80afcb52d0668e5c0b2 (diff) | |
| download | qtwebkit-8b24887dcb8e9ea1fd1b4043795a54bb3d6d3663.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieffcbc84ccd66fc59c5849a0e083e82d8a846c32
| -rw-r--r-- | Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp b/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp index cdadc9c45..f780fbc7e 100644 --- a/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp +++ b/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp @@ -141,7 +141,7 @@ bool Connection::open() // Create the receive port. mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &m_receivePort); -#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 mach_port_set_attributes(mach_task_self(), m_receivePort, MACH_PORT_IMPORTANCE_RECEIVER, (mach_port_info_t)0, 0); #endif @@ -423,7 +423,7 @@ void Connection::receiveSourceEventHandler() OwnPtr<MessageDecoder> decoder = createMessageDecoder(header); ASSERT(decoder); -#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 +#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 decoder->setImportanceAssertion(ImportanceAssertion::create(header)); #endif |