diff options
| author | bungeman@chromium.org <bungeman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-14 16:50:50 +0000 |
|---|---|---|
| committer | bungeman@chromium.org <bungeman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-14 16:50:50 +0000 |
| commit | 7b9e7df1604df77026dd9184927ed64b27f2ec6c (patch) | |
| tree | ae16a8186124b47294f336f02f1de10dd23df332 /third_party/leveldatabase | |
| parent | c6a33ba5ef0d6f232b59a0b3bacf66c1e402ca44 (diff) | |
| download | chromium_src-7b9e7df1604df77026dd9184927ed64b27f2ec6c.zip chromium_src-7b9e7df1604df77026dd9184927ed64b27f2ec6c.tar.gz chromium_src-7b9e7df1604df77026dd9184927ed64b27f2ec6c.tar.bz2 | |
Use the system stdint.h on Windows in leveldatabase.
Skia wishes to use the system stdint.h on Windows. This is now possible
since VC2010 and later provide a stdint.h. VC2008 has been deprecated for
building Chromium (and Skia) for a full year now.
There are a number of stdint.h implementations in the codebase, some of
which hide others, and most of which are not complete (Skia needs
uintmax_t which most do not provide).
The stdint.h in leveldatabase/src/port/win is incomplete and is also
providing (apparently by accident) the stdint.h for Chromium's
src/content. As such, it is also hiding the system stdint.h from Skia
header files included in src/content.
The stdint.h in leveldatabase/src/port/win is also the only file in that
directory, so this change simply removes this directory from the list of
includes.
BUG=81490
R=jsbell@chromium.org
Review URL: https://codereview.chromium.org/27089002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/leveldatabase')
| -rw-r--r-- | third_party/leveldatabase/leveldatabase.gyp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp index 782b678..531f9f6 100644 --- a/third_party/leveldatabase/leveldatabase.gyp +++ b/third_party/leveldatabase/leveldatabase.gyp @@ -25,11 +25,6 @@ 'src/include/', ], 'conditions': [ - ['OS == "win"', { - 'include_dirs': [ - 'src/port/win', - ], - }], ['use_snappy', { 'defines': [ 'USE_SNAPPY=1', @@ -61,13 +56,6 @@ 'src/', '.', ], - 'conditions': [ - ['OS == "win"', { - 'include_dirs': [ - 'src/port/win', - ], - }], - ], }, # Patch posted for upstream, can be removed once that's landed and # rolled into Chromium. |