diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2013-12-12 22:08:18 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-12-12 22:08:18 +0100 |
| commit | ed873a301eeff8c021ba57c78fb702fd2b6f0452 (patch) | |
| tree | 3fb5bcb91b8ceab464a50e63b6fce407eccb17e2 /src/leveldb/include | |
| parent | fb34be6d5905d36a2d9a392d87aa73bdb9470a1b (diff) | |
| parent | 55c68902946c8c9bacea748c159be456a7c9c180 (diff) | |
Merge src/leveldb changes for LevelDB 1.15
Diffstat (limited to 'src/leveldb/include')
| -rw-r--r-- | src/leveldb/include/leveldb/db.h | 2 | ||||
| -rw-r--r-- | src/leveldb/include/leveldb/env.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/leveldb/include/leveldb/db.h b/src/leveldb/include/leveldb/db.h index 57c00a5da0..5ffb29d526 100644 --- a/src/leveldb/include/leveldb/db.h +++ b/src/leveldb/include/leveldb/db.h @@ -14,7 +14,7 @@ namespace leveldb { // Update Makefile if you change these static const int kMajorVersion = 1; -static const int kMinorVersion = 13; +static const int kMinorVersion = 15; struct Options; struct ReadOptions; diff --git a/src/leveldb/include/leveldb/env.h b/src/leveldb/include/leveldb/env.h index fa32289f58..b2072d02c1 100644 --- a/src/leveldb/include/leveldb/env.h +++ b/src/leveldb/include/leveldb/env.h @@ -13,9 +13,9 @@ #ifndef STORAGE_LEVELDB_INCLUDE_ENV_H_ #define STORAGE_LEVELDB_INCLUDE_ENV_H_ -#include <cstdarg> #include <string> #include <vector> +#include <stdarg.h> #include <stdint.h> #include "leveldb/status.h" |