Title: [141263] trunk/Source
- Revision
- 141263
- Author
- [email protected]
- Date
- 2013-01-30 06:48:40 -0800 (Wed, 30 Jan 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (141262 => 141263)
--- trunk/Source/WTF/ChangeLog 2013-01-30 14:36:50 UTC (rev 141262)
+++ trunk/Source/WTF/ChangeLog 2013-01-30 14:48:40 UTC (rev 141263)
@@ -1,3 +1,14 @@
+2013-01-30 Zeno Albisser <[email protected]>
+
+ [Qt] Fix Qt/Mac build after r141024 and r141037
+ https://bugs.webkit.org/show_bug.cgi?id=108318
+
+ Reviewed by Kentaro Hara.
+
+ * wtf/Functional.h:
+ Make sure Block.h is included and its functionality
+ is enabled for Qt on Mac.
+
2013-01-30 Simon Hausmann <[email protected]>
[Qt] Remove QT4_UNICODE related code paths
Modified: trunk/Source/WTF/wtf/Functional.h (141262 => 141263)
--- trunk/Source/WTF/wtf/Functional.h 2013-01-30 14:36:50 UTC (rev 141262)
+++ trunk/Source/WTF/wtf/Functional.h 2013-01-30 14:48:40 UTC (rev 141263)
@@ -32,7 +32,7 @@
#include <wtf/ThreadSafeRefCounted.h>
#include <wtf/WeakPtr.h>
-#if PLATFORM(MAC) && COMPILER_SUPPORTS(BLOCKS)
+#if OS(DARWIN) && COMPILER_SUPPORTS(BLOCKS)
#include <Block.h>
#include <wtf/ObjcRuntimeExtras.h>
#endif
@@ -370,7 +370,7 @@
R (C::*m_function)(P1, P2, P3, P4, P5);
};
-#if PLATFORM(MAC) && COMPILER_SUPPORTS(BLOCKS)
+#if OS(DARWIN) && COMPILER_SUPPORTS(BLOCKS)
template<typename R>
class FunctionWrapper<R (^)()> {
public:
@@ -704,7 +704,7 @@
return impl<R ()>()->operator()();
}
-#if PLATFORM(MAC) && COMPILER_SUPPORTS(BLOCKS)
+#if OS(DARWIN) && COMPILER_SUPPORTS(BLOCKS)
typedef void (^BlockType)();
operator BlockType() const
{
Modified: trunk/Source/WebKit2/ChangeLog (141262 => 141263)
--- trunk/Source/WebKit2/ChangeLog 2013-01-30 14:36:50 UTC (rev 141262)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-30 14:48:40 UTC (rev 141263)
@@ -1,3 +1,14 @@
+2013-01-30 Zeno Albisser <[email protected]>
+
+ [Qt] Fix Qt/Mac build after r141024 and r141037
+ https://bugs.webkit.org/show_bug.cgi?id=108318
+
+ Reviewed by Kentaro Hara.
+
+ * Platform/CoreIPC/mac/ConnectionMac.cpp:
+ (CoreIPC::Connection::platformInvalidate):
+ Replace nullptr with 0 to allow compiling without C++11 support.
+
2013-01-30 Kondapally Kalyan <[email protected]>
[EFL][Qt][WebGL] Avoid deleting an uncreated canvas.
Modified: trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp (141262 => 141263)
--- trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp 2013-01-30 14:36:50 UTC (rev 141262)
+++ trunk/Source/WebKit2/Platform/CoreIPC/mac/ConnectionMac.cpp 2013-01-30 14:48:40 UTC (rev 141263)
@@ -61,25 +61,25 @@
// Unregister our ports.
dispatch_source_cancel(m_deadNameSource);
dispatch_release(m_deadNameSource);
- m_deadNameSource = nullptr;
+ m_deadNameSource = 0;
m_sendPort = MACH_PORT_NULL;
dispatch_source_cancel(m_receivePortDataAvailableSource);
dispatch_release(m_receivePortDataAvailableSource);
- m_receivePortDataAvailableSource = nullptr;
+ m_receivePortDataAvailableSource = 0;
m_receivePort = MACH_PORT_NULL;
if (m_exceptionPort) {
dispatch_source_cancel(m_exceptionPortDataAvailableSource);
dispatch_release(m_exceptionPortDataAvailableSource);
- m_exceptionPortDataAvailableSource = nullptr;
+ m_exceptionPortDataAvailableSource = 0;
m_exceptionPort = MACH_PORT_NULL;
}
#if HAVE(XPC)
if (m_xpcConnection) {
xpc_release(m_xpcConnection);
- m_xpcConnection = nullptr;
+ m_xpcConnection = 0;
}
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
