diff options
| author | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 18:02:43 +0000 |
|---|---|---|
| committer | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 18:02:43 +0000 |
| commit | 6425efe211c40641cc60eb5866c115ffb5ee94d6 (patch) | |
| tree | 768f73ea36e9f6bfe38f800712cf6e2658667a2c /third_party/leveldatabase | |
| parent | 05703ff01613d128a7d06fa09f668acd99c092c7 (diff) | |
| download | chromium_src-6425efe211c40641cc60eb5866c115ffb5ee94d6.zip chromium_src-6425efe211c40641cc60eb5866c115ffb5ee94d6.tar.gz chromium_src-6425efe211c40641cc60eb5866c115ffb5ee94d6.tar.bz2 | |
Roll snappy r37->r61 and enable snappy for leveldb
BUG=81384
Review URL: http://codereview.chromium.org/9866056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/leveldatabase')
| -rw-r--r-- | third_party/leveldatabase/leveldatabase.gyp | 2 | ||||
| -rw-r--r-- | third_party/leveldatabase/port/port_chromium.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp index db59f77..938a3de 100644 --- a/third_party/leveldatabase/leveldatabase.gyp +++ b/third_party/leveldatabase/leveldatabase.gyp @@ -4,7 +4,7 @@ { 'variables': { - 'use_snappy%': 0, + 'use_snappy%': 1, }, 'target_defaults': { 'defines': [ diff --git a/third_party/leveldatabase/port/port_chromium.cc b/third_party/leveldatabase/port/port_chromium.cc index 7f6de92..28f0df4 100644 --- a/third_party/leveldatabase/port/port_chromium.cc +++ b/third_party/leveldatabase/port/port_chromium.cc @@ -62,7 +62,8 @@ bool Snappy_Compress(const char* input, size_t input_length, #endif } -bool Snappy_GetUncompressedLength(const char* input, size_t length, +bool Snappy_GetUncompressedLength(const char* input_data, + size_t input_length, size_t* result) { #if defined(USE_SNAPPY) return snappy::GetUncompressedLength(input_data, input_length, result); |