diff options
Diffstat (limited to 'WebCore/config.h')
| -rw-r--r-- | WebCore/config.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/WebCore/config.h b/WebCore/config.h index 188f212..8a82914 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -315,3 +315,12 @@ typedef float CGFloat; #if PLATFORM(WIN) && PLATFORM(CG) #define WTF_USE_SAFARI_THEME 1 #endif +<<<<<<< HEAD +======= + +#if PLATFORM(QT) && USE(V8) && defined(Q_WS_X11) +/* protect ourselves from evil X11 defines */ +#include <bridge/npruntime_internal.h> +#endif + +>>>>>>> webkit.org at r67908 |