diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-10-22 18:20:14 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-10-22 18:34:26 (GMT) |
| commit | b8e454b7f31d095454098931939c1c517c4b2a13 (patch) | |
| tree | 47962809c2cdadba0bdc101b1d784edff6e047eb /src/3rdparty/webkit/WebCore | |
| parent | 0a6739c13a224f56125120b0eb4d449c06d04a56 (diff) | |
| download | Qt-b8e454b7f31d095454098931939c1c517c4b2a13.zip Qt-b8e454b7f31d095454098931939c1c517c4b2a13.tar.gz Qt-b8e454b7f31d095454098931939c1c517c4b2a13.tar.bz2 | |
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
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/bridge/npapi.h | 4 |
1 files changed, 3 insertions, 1 deletions
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__ */ |