Changeset 48174 in webkit

Timestamp:

Sep 8, 2009 12:21:14 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-09-08 Yongjun Zhang <​yongjun.zhang@nokia.com>

Reviewed by Ariya Hidayat.

​https://bugs.webkit.org/show_bug.cgi?id=28981

[Qt] make npapi.h compile in winscw compiler.

Add XP_SYMBIAN macro to identify Symbian OS; this macro should be used for Symbian
specific changes in npapi.h.
Undefine XP_WIN when building for Symbian to avoid including Windows specific code.

• bridge/npapi.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/npapi.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-08  Yongjun Zhang  <yongjun.zhang@nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28981
+
+        [Qt] make npapi.h compile in winscw compiler.
+
+        Add XP_SYMBIAN macro to identify Symbian OS; this macro should be used for Symbian
+        specific changes in npapi.h.
+        Undefine XP_WIN when building for Symbian to avoid including Windows specific code.
+
+        * bridge/npapi.h:
+
 2009-09-08  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/bridge/npapi.h

@@ -71 +71 @@
 #    endif /* XP_PC */
 #endif /* __MWERKS__ */
+
+#ifdef __SYMBIAN32__
+#   ifndef XP_SYMBIAN
+#       define XP_SYMBIAN 1
+#       undef XP_WIN
+#   endif
+#endif  /* __SYMBIAN32__ */
 
 #if defined(__APPLE_CC__) && !defined(__MACOS_CLASSIC__) && !defined(XP_UNIX)