diff options
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index bdaa4db..ed1e155 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -76,11 +76,11 @@ /* END GOOGLE MODIFICATIONS */ #ifdef __SYMBIAN32__ -# ifndef XP_SYMBIAN -# define XP_SYMBIAN 1 -# undef XP_WIN -# endif -#endif /* __SYMBIAN32__ */ +#ifndef XP_SYMBIAN +#define XP_SYMBIAN 1 +#undef XP_WIN +#endif +#endif #if defined(__APPLE_CC__) && !defined(__MACOS_CLASSIC__) && !defined(XP_UNIX) # define XP_MACOSX @@ -113,6 +113,11 @@ /* END GOOGLE MODIFICATIONS */ #endif +#if defined(XP_SYMBIAN) +#include <QEvent> +#include <QRegion> +#endif + /*----------------------------------------------------------------------*/ /* Plugin Version Constants */ /*----------------------------------------------------------------------*/ @@ -430,7 +435,7 @@ typedef struct _NPWindow uint32_t width; /* Maximum window size */ uint32_t height; NPRect clipRect; /* Clipping rectangle in port coordinates */ -#if defined(XP_UNIX) && !defined(XP_MACOSX) +#if (defined(XP_UNIX) || defined(XP_SYMBIAN)) && !defined(XP_MACOSX) void * ws_info; /* Platform-dependent additional data */ #endif /* XP_UNIX */ NPWindowType type; /* Is this a window or a drawable? */ @@ -477,10 +482,11 @@ typedef struct _NPPrint } NPPrint; #if defined(XP_MACOSX) - #ifndef NP_NO_CARBON typedef EventRecord NPEvent; #endif +#elif defined(XP_SYMBIAN) +typedef QEvent NPEvent; #elif defined(XP_WIN) typedef struct _NPEvent { @@ -495,7 +501,7 @@ typedef struct _NPEvent uint32_t wParam; uint32_t lParam; } NPEvent; -#elif defined (XP_UNIX) && defined(MOZ_X11) +#elif defined(XP_UNIX) && defined(MOZ_X11) /* BEGIN GOOGLE MODIFICATIONS */ typedef union _XEvent XEvent; /* END GOOGLE MODIFICATIONS */ @@ -517,6 +523,8 @@ typedef HRGN NPRegion; typedef struct _XRegion *Region; /* END GOOGLE MODIFICATIONS */ typedef Region NPRegion; +#elif defined(XP_SYMBIAN) +typedef QRegion* NPRegion; #else typedef void *NPRegion; #endif |