diff options
author | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 21:50:28 +0000 |
---|---|---|
committer | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 21:50:28 +0000 |
commit | 8dd5279359975bdc7f4b0ecc8ca30fe2dbaadedb (patch) | |
tree | 225565642f2b9c41175794a8e1726e6a3ed33f79 /third_party/snappy | |
parent | 5a4db43e5865a59581d988a17c259d8027d5e66b (diff) | |
download | chromium_src-8dd5279359975bdc7f4b0ecc8ca30fe2dbaadedb.zip chromium_src-8dd5279359975bdc7f4b0ecc8ca30fe2dbaadedb.tar.gz chromium_src-8dd5279359975bdc7f4b0ecc8ca30fe2dbaadedb.tar.bz2 |
Snappy: Enable snappy compression for leveldb, roll snappy to r74, and suppress warnings
Since compression is turned on in leveldb::Options by default, this will implicitly enable compression for all leveldb usage. Blocks are tagged as compressed or not, so older uncompressed data can still be read, but new data will be compressed when written.
BUG=81384
R=darin@chromium.org
Review URL: https://codereview.chromium.org/12386002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/snappy')
-rw-r--r-- | third_party/snappy/README.chromium | 5 | ||||
-rw-r--r-- | third_party/snappy/snappy.gyp | 19 |
2 files changed, 23 insertions, 1 deletions
diff --git a/third_party/snappy/README.chromium b/third_party/snappy/README.chromium index feaf48d..358a5f3 100644 --- a/third_party/snappy/README.chromium +++ b/third_party/snappy/README.chromium @@ -1,7 +1,7 @@ Name: Snappy: A fast compressor/decompressor Short Name: snappy URL: http://code.google.com/p/snappy/ -Version: r63 +Version: r74 License: New BSD License File: src/COPYING Security Critical: yes @@ -11,5 +11,8 @@ Compression library used by LevelDB. Local Additions: * gyp file for building in chromium + * Suppress clang header-hygiene warning - https://code.google.com/p/snappy/issues/detail?id=70 + * Suppress MSVC signed/unsigned warning - https://code.google.com/p/snappy/issues/detail?id=71 + * Suppress MSVC x64 size_t warnings - https://code.google.com/p/snappy/issues/detail?id=75 * {mac,linux}/config.h autogenerated configuration script * {mac,linux,win}/snappy-stubs-public.h autogenerated public headers diff --git a/third_party/snappy/snappy.gyp b/third_party/snappy/snappy.gyp index f36ff84..e6e94d0 100644 --- a/third_party/snappy/snappy.gyp +++ b/third_party/snappy/snappy.gyp @@ -39,6 +39,25 @@ 'src/snappy.cc', 'src/snappy.h', ], + 'conditions': [ + ['OS=="win"', { + # Signed/unsigned comparison + 'msvs_disabled_warnings': [ + # https://code.google.com/p/snappy/issues/detail?id=71 + 4018, + # https://code.google.com/p/snappy/issues/detail?id=75 + 4267, + ], + }], + ['clang == 1', { + # snappy-stubs-internal.h unapologetically has: using namespace std + # https://code.google.com/p/snappy/issues/detail?id=70 + 'xcode_settings': { + 'WARNING_CFLAGS!': [ '-Wheader-hygiene' ], + }, + 'cflags!': [ '-Wheader-hygiene' ], + }], + ], }, { 'target_name': 'snappy_unittest', |