Bug 686538: Update to npapi-sdk r13. r=roc
authorJosh Aas <joshmoz@gmail.com>
Wed, 14 Sep 2011 12:20:26 -0400
changeset 78253 096051f47636e2c1bf58192c8134a6825376db6e
parent 78252 0a6d1368cd972ef89e2680cde667d4ffddb3e01a
child 78254 262cfa5c56ae88948a48bf0e0b2a1095b64d94f4
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs686538
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 686538: Update to npapi-sdk r13. r=roc
dom/plugins/base/npapi.h
dom/plugins/base/nptypes.h
--- a/dom/plugins/base/npapi.h
+++ b/dom/plugins/base/npapi.h
@@ -406,17 +406,19 @@ typedef enum {
 
   /* Get the NPObject wrapper for the plugins DOM element. */
   NPNVPluginElementNPObject = 16,
 
   NPNVSupportsWindowless = 17,
 
   NPNVprivateModeBool = 18,
 
-  NPNVsupportsAdvancedKeyHandling = 21
+  NPNVsupportsAdvancedKeyHandling = 21,
+
+  NPNVdocumentOrigin = 22
 
 #if defined(XP_MACOSX)
   /* Used for negotiating drawing models */
   , NPNVpluginDrawingModel = 1000
 #ifndef NP_NO_QUICKDRAW
   , NPNVsupportsQuickDrawBool = 2000
 #endif
   , NPNVsupportsCoreGraphicsBool = 2001
--- a/dom/plugins/base/nptypes.h
+++ b/dom/plugins/base/nptypes.h
@@ -50,17 +50,17 @@
    * is predefined tho, both in C and C++.
    */
   typedef short int16_t;
   typedef unsigned short uint16_t;
   typedef int int32_t;
   typedef unsigned int uint32_t;
   typedef long long int64_t;
   typedef unsigned long long uint64_t;
-#elif defined(_AIX) || defined(__sun) || defined(__osf__) || defined(HPUX)
+#elif defined(_AIX) || defined(__sun) || defined(__osf__) || defined(IRIX) || defined(HPUX)
   /*
    * AIX and SunOS ship a inttypes.h header that defines [u]int32_t,
    * but not bool for C.
    */
   #include <inttypes.h>
 
   #ifndef __cplusplus
     typedef int bool;