Make kMajorVersion and kMinorVersion take version from version macros

dyu · Apr 29, 2014 · e525bb1 · e525bb1
1 parent 6cb0cb3
commit e525bb1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -147,7 +147,7 @@ SHARED3 = $(SHARED1)
 SHARED = $(SHARED1)
 else
 # Update db.h if you change these.
-SHARED_MAJOR = 2
+SHARED_MAJOR = 3
 SHARED_MINOR = 0
 SHARED1 = ${LIBNAME}.$(PLATFORM_SHARED_EXT)
 SHARED2 = $(SHARED1).$(SHARED_MAJOR)

diff --git a/README.fb b/README.fb
diff --git a/include/rocksdb/db.h b/include/rocksdb/db.h
@@ -41,9 +41,8 @@ struct ColumnFamilyDescriptor {
       : name(_name), options(_options) {}
 };
 
-// Update Makefile if you change these
-static const int kMajorVersion = 3;
-static const int kMinorVersion = 0;
+static const int kMajorVersion = __ROCKSDB_MAJOR__;
+static const int kMinorVersion = __ROCKSDB_MINOR__;
 
 struct Options;
 struct ReadOptions;

diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
@@ -1,5 +1,6 @@
 #pragma once
 
+// Also update Makefile if you change these
 #define __ROCKSDB_MAJOR__ 3
 #define __ROCKSDB_MINOR__ 0
 #define __ROCKSDB_PATCH__ 0