diff options
| author | jorlow@chromium.org <jorlow@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529> | 2011-03-21 19:09:55 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529> | 2011-03-21 19:09:55 +0000 |
| commit | 24ba6148694a68d010fe0c515616390abc12c5c4 (patch) | |
| tree | c3cea7041092377d92c6924a36cbe8ec9b6712fc | |
| parent | 795dd1d5505cbd3103de4774903bc0382d2a942f (diff) | |
| download | leveldb-24ba6148694a68d010fe0c515616390abc12c5c4.tar.gz | |
Changes to get Snappy working
git-svn-id: https://leveldb.googlecode.com/svn/trunk@8 62dab493-f737-651d-591e-8d6aee1b9529
| -rw-r--r-- | leveldb.gyp | 4 | ||||
| -rw-r--r-- | port/port_chromium.cc | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/leveldb.gyp b/leveldb.gyp index bd43042..934f2d0 100644 --- a/leveldb.gyp +++ b/leveldb.gyp @@ -4,7 +4,7 @@ { 'variables': { - 'use_snappy%': 0, + 'use_snappy%': 1, }, 'target_defaults': { 'defines': [ @@ -38,7 +38,7 @@ 'conditions': [ ['use_snappy', { 'dependencies': [ - '../../../../third_party/snappy/snappy.gyp:snappy', + '../../third_party/snappy/snappy.gyp:snappy', ], }], ], diff --git a/port/port_chromium.cc b/port/port_chromium.cc index c022ec4..e25c1b7 100644 --- a/port/port_chromium.cc +++ b/port/port_chromium.cc @@ -8,7 +8,7 @@ #if defined(USE_SNAPPY) # include "third_party/snappy/src/snappy.h" -# include "third_party/snappy/src/snappy-stubs.h" +# include "snappy-stubs-public.h" #endif namespace leveldb { @@ -55,8 +55,7 @@ void Lightweight_Compress(const char* input, size_t input_length, #if defined(USE_SNAPPY) output->resize(snappy::MaxCompressedLength(input_length)); size_t outlen; - snappy::RawCompress(snappy::StringPiece(input, input_length), - &(*output)[0], &outlen); + snappy::RawCompress(input, input_length, &(*output)[0], &outlen); output->resize(outlen); #else output->assign(input, input_length); @@ -66,13 +65,12 @@ void Lightweight_Compress(const char* input, size_t input_length, bool Lightweight_Uncompress(const char* input_data, size_t input_length, std::string* output) { #if defined(USE_SNAPPY) - snappy::StringPiece input(input_data, input_length); size_t ulength; - if (!snappy::GetUncompressedLength(input, &ulength)) { + if (!snappy::GetUncompressedLength(input_data, input_length, &ulength)) { return false; } output->resize(ulength); - return snappy::RawUncompress(input, &(*output)[0]); + return snappy::RawUncompress(input_data, input_length, &(*output)[0]); #else output->assign(input_data, input_length); return true; |