diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/config.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/config.h')
| -rw-r--r-- | Source/WebCore/config.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h index 13cf56d..513a6c6 100644 --- a/Source/WebCore/config.h +++ b/Source/WebCore/config.h @@ -64,8 +64,8 @@ #else #define WEBKIT_EXPORTDATA __declspec(dllimport) #endif -#define WTF_EXPORT_PRIVATE JS_EXPORTDATA -#define JS_EXPORT_PRIVATE JS_EXPORTDATA +#define WTF_EXPORT_PRIVATE +#define JS_EXPORT_PRIVATE #define JS_EXPORTCLASS JS_EXPORTDATA #else #define JS_EXPORTDATA @@ -272,15 +272,15 @@ #if PLATFORM(WIN) #if defined(WIN_CAIRO) -#undef WTF_PLATFORM_CG -#define WTF_PLATFORM_CAIRO 1 +#undef WTF_USE_CG +#define WTF_USE_CAIRO 1 #define WTF_USE_CURL 1 #ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h #endif #elif !OS(WINCE) -#define WTF_PLATFORM_CG 1 -#undef WTF_PLATFORM_CAIRO +#define WTF_USE_CG 1 +#undef WTF_USE_CAIRO #undef WTF_USE_CURL #endif #endif @@ -322,7 +322,7 @@ #define WTF_USE_JSC !WTF_USE_V8 #endif -#if PLATFORM(CG) +#if USE(CG) #ifndef CGFLOAT_DEFINED #ifdef __LP64__ typedef double CGFloat; @@ -331,20 +331,20 @@ typedef float CGFloat; #endif #define CGFLOAT_DEFINED 1 #endif -#endif /* PLATFORM(CG) */ +#endif /* USE(CG) */ #ifdef BUILDING_ON_TIGER #undef ENABLE_FTPDIR #define ENABLE_FTPDIR 0 #endif -#if PLATFORM(WIN) && PLATFORM(CG) +#if PLATFORM(WIN) && USE(CG) #define WTF_USE_SAFARI_THEME 1 #endif // CoreAnimation is available to IOS, Mac and Windows if using CG -#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && PLATFORM(CG)) -#define WTF_PLATFORM_CA 1 +#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG)) +#define WTF_USE_CA 1 #endif #if PLATFORM(QT) && USE(V8) && defined(Q_WS_X11) |