Attachment 28663 Details for Bug 24630 – Moves and tweaks the BUILDING_ON_* macros to fix non-Apple builds

[patch] Moves and tweaks the BUILDING_ON_* macros to fix non-Apple builds

osx_version.patch (text/plain), 5.57 KB, created by Kevin Ollivier on 2009-03-16 16:22:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Ollivier

Created: 2009-03-16 16:22:12 PDT

Size: 5.57 KB

patch

obsolete

>Index: JavaScriptCore/JavaScriptCorePrefix.h
>===================================================================
>--- JavaScriptCore/JavaScriptCorePrefix.h	(revision 41735)
>+++ JavaScriptCore/JavaScriptCorePrefix.h	(working copy)
>@@ -25,15 +25,6 @@
> 
> #endif
> 
>-#if defined(__APPLE__)
>-#import <AvailabilityMacros.h>
>-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
>-#define BUILDING_ON_TIGER 1
>-#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
>-#define BUILDING_ON_LEOPARD 1
>-#endif
>-#endif
>-
> #ifdef __cplusplus
> #define new ("if you use new/delete make sure to include config.h at the top of the file"()) 
> #define delete ("if you use new/delete make sure to include config.h at the top of the file"()) 
>Index: JavaScriptCore/wtf/Platform.h
>===================================================================
>--- JavaScriptCore/wtf/Platform.h	(revision 41735)
>+++ JavaScriptCore/wtf/Platform.h	(working copy)
>@@ -40,7 +40,13 @@
> /* be used regardless of operating environment */
> #ifdef __APPLE__
> #define WTF_PLATFORM_DARWIN 1
>+#include <AvailabilityMacros.h>
>+#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
>+#define BUILDING_ON_TIGER 1
>+#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
>+#define BUILDING_ON_LEOPARD 1
> #endif
>+#endif
> 
> /* PLATFORM(WIN_OS) */
> /* Operating system level dependencies for Windows that should be used */
>Index: JavaScriptCore/ChangeLog
>===================================================================
>--- JavaScriptCore/ChangeLog	(revision 41748)
>+++ JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2009-03-16  Kevin Ollivier  <kevino@theolliviers.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        Move BUILDING_ON_* defines into Platform.h to make them available to other ports.
>+        Also tweak the defines so that they work with the default values set by 
>+        AvailabilityMacros.h.
>+
>+        * JavaScriptCorePrefix.h:
>+        * wtf/Platform.h:
>+
> 2009-03-15  Simon Fraser  <simon.fraser@apple.com>
> 
>         Revert r41718 because it broke DumpRenderTree on Tiger.
>Index: WebKit/mac/ChangeLog
>===================================================================
>--- WebKit/mac/ChangeLog	(revision 41748)
>+++ WebKit/mac/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2009-03-16  Kevin Ollivier  <kevino@theolliviers.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Tweak the BUILDING_ON_* defines so that they work with the default values set by
>+        AvailabilityMacros.h.
>+
>+        * WebKitPrefix.h:
>+
> 2009-03-16  Anders Carlsson  <andersca@apple.com>
> 
>         Reviewed by Oliver Hunt.
>Index: WebKit/mac/WebKitPrefix.h
>===================================================================
>--- WebKit/mac/WebKitPrefix.h	(revision 41735)
>+++ WebKit/mac/WebKitPrefix.h	(working copy)
>@@ -68,9 +68,9 @@
> 
> #ifdef __OBJC__
> #import <Cocoa/Cocoa.h>
>-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
>+#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
> #define BUILDING_ON_TIGER 1
>-#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
>+#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
> #define BUILDING_ON_LEOPARD 1
> #endif
> #endif
>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 41748)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,11 @@
>+2009-03-16  Kevin Ollivier  <kevino@theolliviers.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Get BUILDING_ON_* defines from Platform.h.
>+
>+        * WebCorePrefix.h:
>+
> 2009-03-16  Darin Adler  <darin@apple.com>
> 
>         Reviewed by Adele Peterson.
>Index: WebCore/WebCorePrefix.h
>===================================================================
>--- WebCore/WebCorePrefix.h	(revision 41735)
>+++ WebCore/WebCorePrefix.h	(working copy)
>@@ -100,16 +100,6 @@
> #include <CoreFoundation/CoreFoundation.h>
> #include <CoreServices/CoreServices.h>
> 
>-#include <AvailabilityMacros.h>
>-
>-#if defined(__APPLE__)
>-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
>-#define BUILDING_ON_TIGER 1
>-#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
>-#define BUILDING_ON_LEOPARD 1
>-#endif
>-#endif
>-
> #ifdef __OBJC__
> #import <Cocoa/Cocoa.h>
> #endif
>Index: WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h
>===================================================================
>--- WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h	(revision 41735)
>+++ WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h	(working copy)
>@@ -32,9 +32,9 @@
> // FIXME: we should add a config.h file for DumpRenderTree.
> #define WTF_PLATFORM_CF 1
> 
>-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
>+#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
> #define BUILDING_ON_TIGER 1
>-#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
>+#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
> #define BUILDING_ON_LEOPARD 1
> #endif
> 
>Index: WebKitTools/ChangeLog
>===================================================================
>--- WebKitTools/ChangeLog	(revision 41748)
>+++ WebKitTools/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2009-03-16  Kevin Ollivier  <kevino@theolliviers.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        Tweak the BUILDING_ON_* defines so that they work with the default values set by
>+        AvailabilityMacros.h.
>+
>+        * DumpRenderTree/mac/DumpRenderTreeMac.h:
>+
> 2009-03-16  Anders Carlsson  <andersca@apple.com>
> 
>         Reviewed by Darin Adler and John Sullivan.

Actions: View | Formatted Diff | Diff

Attachments on bug 24630: 28663 | 28677