diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 00:18:00 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 00:18:00 +0000 |
| commit | 5db28bf1d91f1f1ff5f5bd570ca87976266ed471 (patch) | |
| tree | f8fa9d5a7a8f23d275dcab839342a298f19b78a3 | |
| parent | 58afb15d9e91673bdcc058d6a94bc6c60db22da6 (diff) | |
| download | chromium_src-5db28bf1d91f1f1ff5f5bd570ca87976266ed471.zip chromium_src-5db28bf1d91f1f1ff5f5bd570ca87976266ed471.tar.gz chromium_src-5db28bf1d91f1f1ff5f5bd570ca87976266ed471.tar.bz2 | |
Remove npapi hack from basictypes.h now that npapi.h is fixed.
TEST=compiles on trybots
Review URL: http://codereview.chromium.org/1954005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46528 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/basictypes.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/base/basictypes.h b/base/basictypes.h index e7d79a5..5488636 100644 --- a/base/basictypes.h +++ b/base/basictypes.h @@ -19,12 +19,7 @@ typedef signed char schar; typedef signed char int8; typedef short int16; -// TODO(mbelshe) Remove these type guards. These are -// temporary to avoid conflicts with npapi.h. -#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. @@ -42,12 +37,7 @@ typedef long long int64; typedef unsigned char uint8; typedef unsigned short uint16; -// TODO(mbelshe) Remove these type guards. These are -// temporary to avoid conflicts with npapi.h. -#ifndef _UINT32 -#define _UINT32 typedef unsigned int uint32; -#endif // See the comment above about NSPR and 64-bit. #if __LP64__ |