Title: [122402] trunk
- Revision
- 122402
- Author
- [email protected]
- Date
- 2012-07-11 19:00:45 -0700 (Wed, 11 Jul 2012)
Log Message
Replace definitions of BUILDING_ON / TARGETING macros with macros that will error when used.
Part of <http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros.
Reviewed by Anders Carlsson.
Source/WTF:
* wtf/Platform.h:
Tools:
* DumpRenderTree/TestNetscapePlugIn/PluginObject.h: Remove the macros completely from here since
they're completely unused in TestNetscapePlugIn.
* DumpRenderTree/config.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (122401 => 122402)
--- trunk/Source/WTF/ChangeLog 2012-07-12 02:00:27 UTC (rev 122401)
+++ trunk/Source/WTF/ChangeLog 2012-07-12 02:00:45 UTC (rev 122402)
@@ -1,5 +1,15 @@
2012-07-11 Mark Rowe <[email protected]>
+ Replace definitions of BUILDING_ON / TARGETING macros with macros that will error when used.
+
+ Part of <http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros.
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/Platform.h:
+
+2012-07-11 Mark Rowe <[email protected]>
+
Switch a few cases that care about the SDK over to checking __MAC_OS_X_VERSION_MAX_ALLOWED so that things build.
Part of <http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros
Modified: trunk/Source/WTF/wtf/Platform.h (122401 => 122402)
--- trunk/Source/WTF/wtf/Platform.h 2012-07-12 02:00:27 UTC (rev 122401)
+++ trunk/Source/WTF/wtf/Platform.h 2012-07-12 02:00:45 UTC (rev 122402)
@@ -334,22 +334,20 @@
#define WTF_OS_IOS 1
#elif OS(DARWIN) && defined(TARGET_OS_MAC) && TARGET_OS_MAC
#define WTF_OS_MAC_OS_X 1
-/* FIXME: BUILDING_ON_.., and TARGETING... macros should be folded into the OS() system */
-#if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
-#define BUILDING_ON_LEOPARD 1
-#elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-#define BUILDING_ON_SNOW_LEOPARD 1
-#elif !defined(MAC_OS_X_VERSION_10_8) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
-#define BUILDING_ON_LION 1
+
+/* FIXME: These can be removed after sufficient time has passed since the removal of BUILDING_ON / TARGETING macros. */
+
+#define ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MIN_REQUIRED 0 / 0
+#define ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MAX_ALLOWED 0 / 0
+
+#define BUILDING_ON_LEOPARD ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MIN_REQUIRED
+#define BUILDING_ON_SNOW_LEOPARD ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MIN_REQUIRED
+#define BUILDING_ON_LION ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MIN_REQUIRED
+
+#define TARGETING_LEOPARD ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MAX_ALLOWED
+#define TARGETING_SNOW_LEOPARD ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MAX_ALLOWED
+#define TARGETING_LION ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MAX_ALLOWED
#endif
-#if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
-#define TARGETING_LEOPARD 1
-#elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
-#define TARGETING_SNOW_LEOPARD 1
-#elif !defined(MAC_OS_X_VERSION_10_8) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_8
-#define TARGETING_LION 1
-#endif
-#endif
/* OS(FREEBSD) - FreeBSD */
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
Modified: trunk/Tools/ChangeLog (122401 => 122402)
--- trunk/Tools/ChangeLog 2012-07-12 02:00:27 UTC (rev 122401)
+++ trunk/Tools/ChangeLog 2012-07-12 02:00:45 UTC (rev 122402)
@@ -1,5 +1,17 @@
2012-07-11 Mark Rowe <[email protected]>
+ Replace definitions of BUILDING_ON / TARGETING macros with macros that will error when used.
+
+ Part of <http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros.
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/TestNetscapePlugIn/PluginObject.h: Remove the macros completely from here since
+ they're completely unused in TestNetscapePlugIn.
+ * DumpRenderTree/config.h:
+
+2012-07-11 Mark Rowe <[email protected]>
+
<http://webkit.org/b/91015> Remove BUILDING_ON / TARGETING macros in favor of system availability macros
This removal was handled by a script that translates the relevant macros in to the equivalent checks
Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h (122401 => 122402)
--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h 2012-07-12 02:00:27 UTC (rev 122401)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h 2012-07-12 02:00:45 UTC (rev 122402)
@@ -29,14 +29,6 @@
#include <WebKit/npfunctions.h>
#include <stdarg.h>
-#if defined(XP_MACOSX)
-#if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
-#define BUILDING_ON_LEOPARD 1
-#elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-#define BUILDING_ON_SNOW_LEOPARD 1
-#endif
-#endif // XP_MACOSX
-
class PluginTest;
extern NPNetscapeFuncs *browser;
Modified: trunk/Tools/DumpRenderTree/config.h (122401 => 122402)
--- trunk/Tools/DumpRenderTree/config.h 2012-07-12 02:00:27 UTC (rev 122401)
+++ trunk/Tools/DumpRenderTree/config.h 2012-07-12 02:00:45 UTC (rev 122402)
@@ -50,11 +50,19 @@
#if PLATFORM(MAC)
#define WTF_USE_CF 1
-#if !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
-#define BUILDING_ON_LEOPARD 1
-#elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-#define BUILDING_ON_SNOW_LEOPARD 1
-#endif
+// FIXME: These can be removed after sufficient time has passed since the removal of BUILDING_ON / TARGETING macros.
+
+#define ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MIN_REQUIRED 0 / 0
+#define ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MAX_ALLOWED 0 / 0
+
+#define BUILDING_ON_LEOPARD ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MIN_REQUIRED
+#define BUILDING_ON_SNOW_LEOPARD ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MIN_REQUIRED
+#define BUILDING_ON_LION ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MIN_REQUIRED
+
+#define TARGETING_LEOPARD ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MAX_ALLOWED
+#define TARGETING_SNOW_LEOPARD ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MAX_ALLOWED
+#define TARGETING_LION ERROR_PLEASE_COMPARE_WITH_MAC_OS_X_VERSION_MAX_ALLOWED
+
#endif // PLATFORM(MAC)
#if OS(WINDOWS)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes