Title: [174183] trunk/Source/WTF
Revision
174183
Author
dba...@webkit.org
Date
2014-10-01 15:59:02 -0700 (Wed, 01 Oct 2014)

Log Message

Attempt to fix the build after <https://trac.webkit.org/changeset/174180>
(https://bugs.webkit.org/show_bug.cgi?id=137277)

Include header <Availability.h> for the definition of __MAC_OS_X_VERSION_MIN_REQUIRED.
Also, we want to define CONST_ON_OR_AFTER_MAC_OS_X_VERSION_1090 to be const when building
on iOS.

* wtf/spi/darwin/XPCSPI.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (174182 => 174183)


--- trunk/Source/WTF/ChangeLog	2014-10-01 22:46:39 UTC (rev 174182)
+++ trunk/Source/WTF/ChangeLog	2014-10-01 22:59:02 UTC (rev 174183)
@@ -1,5 +1,16 @@
 2014-10-01  Daniel Bates  <daba...@apple.com>
 
+        Attempt to fix the build after <https://trac.webkit.org/changeset/174180>
+        (https://bugs.webkit.org/show_bug.cgi?id=137277)
+
+        Include header <Availability.h> for the definition of __MAC_OS_X_VERSION_MIN_REQUIRED.
+        Also, we want to define CONST_ON_OR_AFTER_MAC_OS_X_VERSION_1090 to be const when building
+        on iOS.
+
+        * wtf/spi/darwin/XPCSPI.h:
+
+2014-10-01  Daniel Bates  <daba...@apple.com>
+
         Clean up: Move XPC forward declarations in _javascript_Core to WTF SPI wrapper header
         https://bugs.webkit.org/show_bug.cgi?id=137277
 

Modified: trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h (174182 => 174183)


--- trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h	2014-10-01 22:46:39 UTC (rev 174182)
+++ trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h	2014-10-01 22:59:02 UTC (rev 174183)
@@ -26,6 +26,7 @@
 #ifndef XPCSPI_h
 #define XPCSPI_h
 
+#include <Availability.h>
 #include <dispatch/dispatch.h>
 #include <os/object.h>
 
@@ -78,7 +79,7 @@
 #include <xpc/private.h>
 #endif
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
 #define CONST_ON_OR_AFTER_MAC_OS_X_VERSION_1090 const
 #else
 #define CONST_ON_OR_AFTER_MAC_OS_X_VERSION_1090
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to