diff options
Diffstat (limited to 'Source/WebKit2/config.h')
| -rw-r--r-- | Source/WebKit2/config.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebKit2/config.h b/Source/WebKit2/config.h index 3723185..8250891 100644 --- a/Source/WebKit2/config.h +++ b/Source/WebKit2/config.h @@ -125,7 +125,7 @@ static const type& name() \ #include <WebCore/config.h> #include <windows.h> -#if PLATFORM(CG) +#if USE(CG) #include <CoreGraphics/CoreGraphics.h> #endif @@ -141,12 +141,14 @@ static const type& name() \ #endif -#if PLATFORM(MAC) || (OS(MAC_OS_X) && PLATFORM(QT)) +#if PLATFORM(MAC) #define PLUGIN_ARCHITECTURE_MAC 1 -#elif PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(QT)) +#elif PLATFORM(WIN) #define PLUGIN_ARCHITECTURE_WIN 1 -#elif (PLATFORM(QT) && defined(Q_WS_X11)) || (PLATFORM(GTK) && OS(UNIX) && !OS(MAC_OS_X)) +#elif (PLATFORM(QT) || (PLATFORM(GTK))) && (OS(UNIX) && !OS(MAC_OS_X) && !OS(SYMBIAN)) #define PLUGIN_ARCHITECTURE_X11 1 +#else +#define PLUGIN_ARCHITECTURE_UNSUPPORTED 1 #endif #define PLUGIN_ARCHITECTURE(ARCH) (defined PLUGIN_ARCHITECTURE_##ARCH && PLUGIN_ARCHITECTURE_##ARCH) |