diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCorePrefix.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCorePrefix.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCorePrefix.h b/src/3rdparty/webkit/WebCore/WebCorePrefix.h index e857ecc82..c0d1e7090 100644 --- a/src/3rdparty/webkit/WebCore/WebCorePrefix.h +++ b/src/3rdparty/webkit/WebCore/WebCorePrefix.h @@ -18,8 +18,8 @@ * */ -/* This prefix file is for use on Mac OS X and Windows only. It should contain only: - * 1) files to precompile on Mac OS X and Windows for faster builds +/* This prefix file should contain only: + * 1) files to precompile for faster builds * 2) in one case at least: OS-X-specific performance bug workarounds * 3) the special trick to catch us using new or delete without including "config.h" * The project should be able to build without this header, although we rarely test that. @@ -45,9 +45,11 @@ #define WINVER 0x0500 #endif +#ifndef WTF_USE_CURL #ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h #endif +#endif // If we don't define these, they get defined in windef.h. // We want to use std::min and std::max @@ -65,7 +67,13 @@ #if defined(__APPLE__) #include <regex.h> #endif + +// On Linux this causes conflicts with libpng because there are two impls. of +// longjmp - see here: https://bugs.launchpad.net/ubuntu/+source/libpng/+bug/218409 +#ifndef BUILDING_WX__ #include <setjmp.h> +#endif + #include <signal.h> #include <stdarg.h> #include <stddef.h> @@ -97,8 +105,16 @@ #include <time.h> +#ifndef BUILDING_WX__ #include <CoreFoundation/CoreFoundation.h> +#ifdef WIN_CAIRO +#include <ConditionalMacros.h> +#include <windows.h> +#include <stdio.h> +#else #include <CoreServices/CoreServices.h> +#endif +#endif #ifdef __OBJC__ #import <Cocoa/Cocoa.h> |