summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/bridge/npapi.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/webkit/WebCore/bridge/npapi.h')
-rw-r--r--src/3rdparty/webkit/WebCore/bridge/npapi.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/bridge/npapi.h b/src/3rdparty/webkit/WebCore/bridge/npapi.h
index 1904a8709..07fed86b5 100644
--- a/src/3rdparty/webkit/WebCore/bridge/npapi.h
+++ b/src/3rdparty/webkit/WebCore/bridge/npapi.h
@@ -114,6 +114,14 @@
/* Definition of Basic Types */
/*----------------------------------------------------------------------*/
+/* QNX sets the _INT16 and friends defines, but does not typedef the types */
+#ifdef __QNXNTO__
+#undef _UINT16
+#undef _INT16
+#undef _UINT32
+#undef _INT32
+#endif
+
#ifndef _UINT16
#define _UINT16
typedef unsigned short uint16;
@@ -341,8 +349,6 @@ typedef enum {
*/
NPPVpluginWantsAllNetworkStreams = 18,
- NPPVpluginPrivateModeBool = 19,
-
/* Checks to see if the plug-in would like the browser to load the "src" attribute. */
NPPVpluginCancelSrcStream = 20,