diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 17:50:58 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 17:50:58 +0000 |
commit | 3ddcee7c42d8b42c10558e004506244ea2b3d779 (patch) | |
tree | ba842a1063947f4348b55a0d98cb82b963d2f96c /base | |
parent | e54e058d943c55b6239e7a8f822e59fa9bfd4ab9 (diff) | |
download | chromium_src-3ddcee7c42d8b42c10558e004506244ea2b3d779.zip chromium_src-3ddcee7c42d8b42c10558e004506244ea2b3d779.tar.gz chromium_src-3ddcee7c42d8b42c10558e004506244ea2b3d779.tar.bz2 |
Make sdch not use an incompatible stdint.h.
We force-include our own logging.h, which includes basictypes.h, which
now includes stdint.h. Without this change, this ends up being
minimal/hacky stdint.h (from sdch/open-vcdiff/vsprojects), which isn't
sufficient for the needs of the rest of basictypes.h.
R=brettw@chromium.org, jar@chromium.org
BUG=138542
Review URL: https://codereview.chromium.org/110273004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/basictypes.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/base/basictypes.h b/base/basictypes.h index 842d784..cdd127e 100644 --- a/base/basictypes.h +++ b/base/basictypes.h @@ -13,16 +13,8 @@ #include "base/compiler_specific.h" #include "base/port.h" // Types that only need exist on certain systems. -// TODO(vtl): We get conflicts with other definitions of |int8|/|uint8| if we -// try to define them as |int8_t|/|uint8_t|, at least on Windows. -#ifdef _MSC_VER -typedef signed char int8; -typedef unsigned char uint8; -#else typedef int8_t int8; typedef uint8_t uint8; -#endif - typedef int16_t int16; typedef int32_t int32; typedef uint16_t uint16; |