Changeset 122496 in webkit

Timestamp:

Jul 12, 2012 1:19:04 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium][Mac] r122400 broke 10.6 build
​https://bugs.webkit.org/show_bug.cgi?id=91103

Patch by Robert Sesek <​rsesek@chromium.org> on 2012-07-12
Reviewed by Tony Chang.

Use the right availability macros for forward-declaring methods and
defining constants.

• src/mac/WebInputEventFactory.mm:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/mac/WebInputEventFactory.mm (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-07-12  Robert Sesek  <rsesek@chromium.org>
+
+        [chromium][Mac] r122400 broke 10.6 build
+        https://bugs.webkit.org/show_bug.cgi?id=91103
+
+        Reviewed by Tony Chang.
+
+        Use the right availability macros for forward-declaring methods and
+        defining constants.
+
+        * src/mac/WebInputEventFactory.mm:
+
 2012-07-12  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm

@@ -35 +35 @@
 #include <wtf/ASCIICType.h>
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
 
 // Additional Lion APIs.
@@ -54 +54 @@
 @end
 
-#endif  // __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
+#endif  // __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+
+// Do not __MAC_OS_X_VERSION_MAX_ALLOWED here because of a bug in the 10.5 SDK,
+// see <http://lists.webkit.org/pipermail/webkit-dev/2012-July/021442.html>.
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1050
 
 // These are not defined in the 10.5 SDK but are defined in later SDKs inside
@@ -65 +67 @@
 };
 
-#endif  // __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
+#endif  // MAC_OS_X_VERSION_MAX_ALLOWED <= 1050
 
 namespace WebKit {