diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
| commit | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch) | |
| tree | 4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /WebKit/mac/WebKitPrefix.h | |
| parent | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff) | |
| download | external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'WebKit/mac/WebKitPrefix.h')
| -rw-r--r-- | WebKit/mac/WebKitPrefix.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/WebKit/mac/WebKitPrefix.h b/WebKit/mac/WebKitPrefix.h index 73a1048..da2f2d4 100644 --- a/WebKit/mac/WebKitPrefix.h +++ b/WebKit/mac/WebKitPrefix.h @@ -57,20 +57,32 @@ #import <ApplicationServices/ApplicationServices.h> #import <Carbon/Carbon.h> +#ifndef CGFLOAT_DEFINED +#ifdef __LP64__ +typedef double CGFloat; +#else +typedef float CGFloat; +#endif +#define CGFLOAT_DEFINED 1 +#endif + #ifdef __OBJC__ #import <Cocoa/Cocoa.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 -#include <JavaScriptCore/Platform.h> +#include "EmptyProtocolDefinitions.h" -#ifdef __LP64__ -#define WTF_USE_NPOBJECT 0 -#else -#define WTF_USE_NPOBJECT 1 -#endif +#include <wtf/Platform.h> + +/* WebKit has no way to pull settings from WebCore/config.h for now */ +/* so we assume WebKit is always being compiled on top of JavaScriptCore */ +#define WTF_USE_JSC 1 +#define WTF_USE_V8 0 #ifdef __cplusplus #include <wtf/FastMalloc.h> |