From b8e454b7f31d095454098931939c1c517c4b2a13 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Date: Thu, 22 Oct 2009 20:20:14 +0200
Subject: Temporary fix in qt.git to allow build on s60. Should be overwritten
 when the final patch of this bug hits trunk:
 https://bugs.webkit.org/show_bug.cgi?id=30671

Patch-by: Janne Koskinen
Reviewed-by: Jocelyn Turcotte
---
 src/3rdparty/webkit/WebCore/bridge/npapi.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/3rdparty/webkit/WebCore/bridge/npapi.h b/src/3rdparty/webkit/WebCore/bridge/npapi.h
index d57b76d..5d48b0d 100644
--- a/src/3rdparty/webkit/WebCore/bridge/npapi.h
+++ b/src/3rdparty/webkit/WebCore/bridge/npapi.h
@@ -64,7 +64,9 @@
 #        endif /* XP_MAC */
 #    endif /* macintosh */
 #    ifdef __INTEL__
-#        undef NULL
+#       ifndef __SYMBIAN32__
+#           undef NULL
+#       endif
 #        ifndef XP_WIN
 #            define XP_WIN 1
 #        endif /* __INTEL__ */
-- 
cgit v0.12