diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 00:49:47 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 00:49:47 +0000 |
| commit | 25298dc5dbfef4e63161920ddd976ef22f77f8f4 (patch) | |
| tree | d12df969608e1bf4dcdf8a012e4b4b4d33d33d3d | |
| parent | b6914c360b2f40bd135ad5242f256efa22113ba3 (diff) | |
| download | chromium_src-25298dc5dbfef4e63161920ddd976ef22f77f8f4.zip chromium_src-25298dc5dbfef4e63161920ddd976ef22f77f8f4.tar.gz chromium_src-25298dc5dbfef4e63161920ddd976ef22f77f8f4.tar.bz2 | |
Revert "Remove npapi hack from basictypes.h now that npapi.h is fixed."
This reverts commit r46528 because it broke the Chrome Frame build.
Chrome Frame: why we can't have nice things.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46533 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/basictypes.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/base/basictypes.h b/base/basictypes.h index 5488636..64ec1050 100644 --- a/base/basictypes.h +++ b/base/basictypes.h @@ -19,7 +19,12 @@ typedef signed char schar; typedef signed char int8; typedef short int16; +// TODO: Remove these type guards. These are to avoid conflicts with +// obsolete/protypes.h in the Gecko SDK. +#ifndef _INT32 +#define _INT32 typedef int int32; +#endif // The NSPR system headers define 64-bit as |long| when possible. In order to // not have typedef mismatches, we do the same on LP64. @@ -37,7 +42,12 @@ typedef long long int64; typedef unsigned char uint8; typedef unsigned short uint16; +// TODO: Remove these type guards. These are to avoid conflicts with +// obsolete/protypes.h in the Gecko SDK. +#ifndef _UINT32 +#define _UINT32 typedef unsigned int uint32; +#endif // See the comment above about NSPR and 64-bit. #if __LP64__ |