diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-18 15:36:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-18 19:20:06 +0100 |
| commit | d227fc870c7a697500a3c900c31baf05fb9a8524 (patch) | |
| tree | a3fa109aa5bf52fef562ac49d97a2f723889cc71 /WebCore/bridge/npapi.h | |
| parent | f2c627513266faa73f7669058d98c60769fb3524 (diff) | |
| download | external_webkit-d227fc870c7a697500a3c900c31baf05fb9a8524.zip external_webkit-d227fc870c7a697500a3c900c31baf05fb9a8524.tar.gz external_webkit-d227fc870c7a697500a3c900c31baf05fb9a8524.tar.bz2 | |
Merge WebKit r47420
Diffstat (limited to 'WebCore/bridge/npapi.h')
| -rw-r--r-- | WebCore/bridge/npapi.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h index 126d513..5991f5b 100644 --- a/WebCore/bridge/npapi.h +++ b/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; |