diff options
| author | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 22:23:06 +0000 |
|---|---|---|
| committer | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 22:23:06 +0000 |
| commit | 7e6779d40e08927676047e25e4e6405164ef5779 (patch) | |
| tree | a520d2c8bd63a9e283c9016b95cc6ac6a21263ce /third_party | |
| parent | 10a9c27c81bba840362267c74c5b7c66a844f6fc (diff) | |
| download | chromium_src-7e6779d40e08927676047e25e4e6405164ef5779.zip chromium_src-7e6779d40e08927676047e25e4e6405164ef5779.tar.gz chromium_src-7e6779d40e08927676047e25e4e6405164ef5779.tar.bz2 | |
A few small changes to make npapi header files useful in the
native client build (and in the toolchain, which is where the
#ifdef stuff comes from).
Review URL: http://codereview.chromium.org/342079
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -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 |