diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 22:56:02 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 22:56:02 +0000 |
| commit | f1e85a46ec78584912e825b100d1a7fd1d793ce3 (patch) | |
| tree | 9341de2d2246365684ed610387eae14a8d774dca /third_party | |
| parent | c6f6f20a02720de423085e110e27dc22589ea186 (diff) | |
| download | chromium_src-f1e85a46ec78584912e825b100d1a7fd1d793ce3.zip chromium_src-f1e85a46ec78584912e825b100d1a7fd1d793ce3.tar.gz chromium_src-f1e85a46ec78584912e825b100d1a7fd1d793ce3.tar.bz2 | |
don't include nptypes.h for native client
Review URL: http://codereview.chromium.org/2077010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index a8f0ac1..685f609 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -42,10 +42,12 @@ #pragma pack(1) #endif -#include "nptypes.h" - /* BEGIN GOOGLE MODIFICATIONS */ +#ifndef __native_client__ +#include "nptypes.h" +#endif + #ifdef __native_client__ #include <stdint.h> #include <sys/types.h> |