Changes to get Snappy working

git-svn-id: https://leveldb.googlecode.com/svn/trunk@8 62dab493-f737-651d-591e-8d6aee1b9529
caiosba · Mar 21, 2011 · 24ba614 · 24ba614
1 parent 795dd1d
commit 24ba614
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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;