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 /sdch | |
| 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 'sdch')
| -rw-r--r-- | sdch/README.chromium | 4 | ||||
| -rw-r--r-- | sdch/sdch.gyp | 2 | ||||
| -rw-r--r-- | sdch/win/config.h | 14 |
3 files changed, 19 insertions, 1 deletions
diff --git a/sdch/README.chromium b/sdch/README.chromium index 0275c7a..93ae6a0 100644 --- a/sdch/README.chromium +++ b/sdch/README.chromium @@ -13,3 +13,7 @@ The ios directory contains a config.h generated from a run of configure CPPFLAGS=-isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk CXX=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -x c++ -arch armv6 CXXFLAGS=-mno-thumb -miphoneos-version-min=4.2 + +The win directory contains a config.h that forwards to one provided with +open-vcdiff. We have this to avoid putting open-vcdiff's minimal stdint.h hack +into our include path. diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp index 8d609d5..2e74aa5 100644 --- a/sdch/sdch.gyp +++ b/sdch/sdch.gyp @@ -57,7 +57,7 @@ [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ], [ 'OS == "ios"', { 'include_dirs': [ 'ios' ] } ], [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ], - [ 'OS == "win"', { 'include_dirs': [ 'open-vcdiff/vsprojects' ] } ], + [ 'OS == "win"', { 'include_dirs': [ 'win' ] } ], # TODO(mark): Remove usage of the deprecated auto_ptr. [ 'clang == 1', { 'cflags': [ '-Wno-deprecated-declarations' ] } ], ], diff --git a/sdch/win/config.h b/sdch/win/config.h new file mode 100644 index 0000000..b5fb37c --- /dev/null +++ b/sdch/win/config.h @@ -0,0 +1,14 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// This file and directory exist so that we can use the provided config.h +// without putting vsprojects into our include path (which would also give us an +// incorrect/incompatible stdint.h). + +#ifndef SDCH_WIN_CONFIG_H_ +#define SDCH_WIN_CONFIG_H_ + +#include "../open-vcdiff/vsprojects/config.h" + +#endif // SDCH_WIN_CONFIG_H_ |