diff options
Diffstat (limited to 'Tools/WebKitTestRunner/config.h')
-rw-r--r-- | Tools/WebKitTestRunner/config.h | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/Tools/WebKitTestRunner/config.h b/Tools/WebKitTestRunner/config.h index d5cd2f97d..4fb2a4b5e 100644 --- a/Tools/WebKitTestRunner/config.h +++ b/Tools/WebKitTestRunner/config.h @@ -29,32 +29,13 @@ #include "cmakeconfig.h" #endif +#include <WebKit/WebKit2_C.h> #include <wtf/Platform.h> #include <wtf/ExportMacros.h> #include <runtime/JSExportMacros.h> -#include <WebKit2/WebKit2_C.h> - -#if PLATFORM(WIN) -#define WTF_USE_CF 1 -#if defined(WIN_CAIRO) -#define WTF_USE_CAIRO 1 -#define WTF_USE_CURL 1 -#else -#define WTF_USE_CG 1 -#define WTF_USE_CFNETWORK 1 -#endif -#endif - -#if OS(WINDOWS) -/* If we don't define these, they get defined in windef.h. */ -/* We want to use std::min and std::max. */ -#ifndef max -#define max max -#endif -#ifndef min -#define min min -#endif -#endif +// This is needed because we include WebCore's headers. +// FIXME: We should include <WebCore/PlatformExportMacros.h> instead. +#define WEBCORE_EXPORT #endif |