Fix Mac build now.
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Sep 2013 22:57:31 +0000 (22:57 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 24 Sep 2013 22:57:31 +0000 (22:57 +0000)
* UIProcess/WebContext.messages.in:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156368 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebContext.messages.in

index f6c2682..c020e55 100644 (file)
@@ -1,7 +1,15 @@
+2013-09-24  Alexey Proskuryakov  <ap@apple.com>
+
+        Fix Mac build now.
+        
+        * UIProcess/WebContext.messages.in:
+
 2013-09-24  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         Unreviewed buildfix after r156350.
 
+        It seems that nested ifdefs don't work in messages.in files, so don't use them.
+
         * UIProcess/WebContext.messages.in:
 
 2013-09-24  Csaba Osztrogon√°c  <ossy@webkit.org>
index ef6c78a..07e2806 100644 (file)
@@ -27,13 +27,13 @@ messages -> WebContext LegacyReceiver {
 
     DidGetStatistics(WebKit::StatisticsData statisticsData, uint64_t callbackID)
 
-#if PLATFORM(MAC)
+#if PLATFORM(IOS)
     WriteWebContentToPasteboard(WebCore::PasteboardWebContent content)
     WriteImageToPasteboard(WebCore::PasteboardImage pasteboardImage)
     WriteStringToPasteboard(WTF::String text)
 #endif
 
-#if PLATFORM(MAC) && PLATFORM(IOS)
+#if PLATFORM(MAC)
     # Pasteboard messages.
     GetPasteboardTypes(WTF::String pasteboardName) -> (Vector<WTF::String> types)
     GetPasteboardPathnamesForType(WTF::String pasteboardName, WTF::String pasteboardType) -> (Vector<WTF::String> pathnames)