diff options
Diffstat (limited to 'third_party/npapi')
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 8 | ||||
| -rw-r--r-- | third_party/npapi/bindings/npruntime.h | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index cb75db4..a606b7e 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -46,7 +46,11 @@ /* BEGIN GOOGLE MODIFICATIONS */ +#ifdef __native_client__ +#include <stdint.h> +#else #include "base/basictypes.h" +#endif /* __native_client__ */ /* END GOOGLE MODIFICATIONS */ @@ -382,11 +386,11 @@ typedef enum { NPPVpluginWantsAllNetworkStreams = 18, /* Checks to see if the plug-in would like the browser to load the "src" attribute. */ - NPPVpluginCancelSrcStream = 20, + NPPVpluginCancelSrcStream = 20 #ifdef XP_MACOSX /* Used for negotiating drawing models */ - NPPVpluginDrawingModel = 1000, + , NPPVpluginDrawingModel = 1000, /* Used for negotiating event models */ NPPVpluginEventModel = 1001, /* In the NPDrawingModelCoreAnimation drawing model, the browser asks the plug-in for a Core Animation layer. */ diff --git a/third_party/npapi/bindings/npruntime.h b/third_party/npapi/bindings/npruntime.h index eac3727..e050b21 100644 --- a/third_party/npapi/bindings/npruntime.h +++ b/third_party/npapi/bindings/npruntime.h @@ -70,10 +70,8 @@ // BEGIN GOOGLE MODIFICATIONS - -#include "base/basictypes.h" -#include "bindings/npapi.h" - +#include "npapi.h" +#ifndef __native_client__ typedef uint8 uint8_t; typedef int8 int8_t; typedef uint16 uint16_t; @@ -82,7 +80,7 @@ typedef uint32 uint32_t; typedef int32 int32_t; typedef int64 int64_t; typedef uint64 uint64_t; - +#endif /* __native_client__ */ // END GOOGLE MODIFICATIONS |