diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-04 18:16:56 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-04 18:16:56 +0000 |
| commit | 7edfe106be9de3a636a27304534c246c0f2f36b0 (patch) | |
| tree | 479bed2636966a01c4e5b0cd5ec8f8dfb61a16e3 /third_party | |
| parent | 49c3fdf47f6e7507ba1d78bf6b3813d1deb2c7d1 (diff) | |
| download | chromium_src-7edfe106be9de3a636a27304534c246c0f2f36b0.zip chromium_src-7edfe106be9de3a636a27304534c246c0f2f36b0.tar.gz chromium_src-7edfe106be9de3a636a27304534c246c0f2f36b0.tar.bz2 | |
Fix more type issues from the npapi.h tranisition to *_t types
Fixes the remaining not _t types in our plugin code
Removes the extra typedefs added to our copy of npapi.h
Adds headers to plugin code where necessary due to implicit dependencies on standard headers via basictypes.h
BUG=42645
TEST=Everything still compiles
Review URL: http://codereview.chromium.org/2505001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 19 | ||||
| -rw-r--r-- | third_party/npapi/bindings/npapi_extensions.h | 2 |
2 files changed, 2 insertions, 19 deletions
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index 6878dc8..e4693f2 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -51,25 +51,6 @@ #ifdef __native_client__ #include <stdint.h> #include <sys/types.h> -/* typedefs needed for NaCl DEPS update */ -/* TODO: convert npapi_extensions.h to int32_t, etc */ -/* and remove these typedefs */ -#ifndef _INT32 -#define _INT32 -typedef int int32; -#endif -#ifndef _UINT32 -#define _UINT32 -typedef unsigned int uint32; -#endif -#ifndef _INT16 -#define _INT16 -typedef short int16; -#endif -#ifndef _UINT16 -#define _UINT16 -typedef unsigned short uint16; -#endif #else #include "base/basictypes.h" #endif /* __native_client__ */ diff --git a/third_party/npapi/bindings/npapi_extensions.h b/third_party/npapi/bindings/npapi_extensions.h index 20df63a..c1c2f01 100644 --- a/third_party/npapi/bindings/npapi_extensions.h +++ b/third_party/npapi/bindings/npapi_extensions.h @@ -10,6 +10,8 @@ // Chromium projects, such as the Native Client SDK. #include "npapi.h" +#include <stddef.h> // For size_t + /* * A fake "enum" value for getting browser-implemented Pepper extensions. * The variable returns a pointer to an NPNExtensions structure. */ |