Rename libmdb to liblmdb, lmdb.h

Avoid naming conflicts with other mdb* packages. Bump version to 0.9.5

diff --git a/libraries/libmdb/Makefile b/libraries/libmdb/Makefile
index 67a2007bb890e70e6e9708c024c22f083d940797..5c206f223893e2127b337562bb251d79ed5fea0d 100644 (file)
--- a/libraries/libmdb/Makefile
+++ b/libraries/libmdb/Makefile
@@ -6,7 +6,7 @@ LDLIBS  =
 SOLIBS =
 
 PROGS  = mdb_stat mdb_copy mtest mtest2 mtest3 mtest4 mtest5
-all:   libmdb.a libmdb.so $(PROGS)
+all:   liblmdb.a liblmdb.so $(PROGS)
 
 clean:
        rm -rf $(PROGS) *.[ao] *.so *~ testdb
@@ -15,23 +15,23 @@ test:       all
        mkdir testdb
        ./mtest && ./mdb_stat testdb
 
-libmdb.a:      mdb.o midl.o
+liblmdb.a:     mdb.o midl.o
        ar rs $@ mdb.o midl.o
 
-libmdb.so:     mdb.o midl.o
+liblmdb.so:    mdb.o midl.o
        gcc -pthread -shared -o $@ mdb.o midl.o $(SOLIBS)
 
-mdb_stat: mdb_stat.o libmdb.a
-mdb_copy: mdb_copy.o libmdb.a
-mtest:    mtest.o    libmdb.a
-mtest2:        mtest2.o libmdb.a
-mtest3:        mtest3.o libmdb.a
-mtest4:        mtest4.o libmdb.a
-mtest5:        mtest5.o libmdb.a
-mtest6:        mtest6.o libmdb.a
-mfree: mfree.o libmdb.a
-
-mdb.o: mdb.c mdb.h midl.h
+mdb_stat: mdb_stat.o liblmdb.a
+mdb_copy: mdb_copy.o liblmdb.a
+mtest:    mtest.o    liblmdb.a
+mtest2:        mtest2.o liblmdb.a
+mtest3:        mtest3.o liblmdb.a
+mtest4:        mtest4.o liblmdb.a
+mtest5:        mtest5.o liblmdb.a
+mtest6:        mtest6.o liblmdb.a
+mfree: mfree.o liblmdb.a
+
+mdb.o: mdb.c lmdb.h midl.h
        $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c
 
 midl.o: midl.c midl.h
@@ -40,5 +40,5 @@ midl.o: midl.c midl.h
 %:     %.o
        $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
-%.o:   %.c mdb.h
+%.o:   %.c lmdb.h
        $(CC) $(CFLAGS) $(CPPFLAGS) -c $<

diff --git a/libraries/libmdb/mdb.h b/libraries/libmdb/lmdb.h
similarity index 99%
rename from libraries/libmdb/mdb.h
rename to libraries/libmdb/lmdb.h
index 784c5ee0ad9052b7001e192e5e3bce6e6db4fcae..a2118b5bac5570b2b3f524e6a63b4d14b5d10be9 100644 (file)
--- a/libraries/libmdb/mdb.h
+++ b/libraries/libmdb/lmdb.h
@@ -1,7 +1,7 @@
-/** @file mdb.h
- *     @brief memory-mapped database library
+/** @file lmdb.h
+ *     @brief Lightning memory-mapped database library
  *
- *     @mainpage       MDB Memory-Mapped Database Manager
+ *     @mainpage       MDB Lightning Memory-Mapped Database Manager
  *
  *     @section intro_sec Introduction
  *     MDB is a Btree-based database management library modeled loosely on the
@@ -127,8 +127,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef _MDB_H_
-#define _MDB_H_
+#ifndef _LMDB_H_
+#define _LMDB_H_
 
 #include <sys/types.h>
 
@@ -138,7 +138,7 @@ extern "C" {
 
 /** @defgroup mdb MDB API
  *     @{
- *     @brief OpenLDAP Memory-Mapped Database Manager
+ *     @brief OpenLDAP Lightning Memory-Mapped Database Manager
  */
 /** @defgroup Version Version Macros
  *     @{
@@ -148,7 +148,7 @@ extern "C" {
 /** Library minor version */
 #define MDB_VERSION_MINOR      9
 /** Library patch version */
-#define MDB_VERSION_PATCH      4
+#define MDB_VERSION_PATCH      5
 
 /** Combine args a,b,c into a single integer for easy version comparisons */
 #define MDB_VERINT(a,b,c)      (((a) << 24) | ((b) << 16) | (c))
@@ -158,7 +158,7 @@ extern "C" {
        MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH)
 
 /** The release date of this library version */
-#define MDB_VERSION_DATE       "September 14, 2012"
+#define MDB_VERSION_DATE       "November 30, 2012"
 
 /** A stringifier for the version info */
 #define MDB_VERSTR(a,b,c,d)    "MDB " #a "." #b "." #c ": (" d ")"
@@ -1160,4 +1160,4 @@ int  mdb_dcmp(MDB_txn *txn, MDB_dbi dbi, const MDB_val *a, const MDB_val *b);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _MDB_H_ */
+#endif /* _LMDB_H_ */

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 117b40230ad9afe8ff30ad2e96cf2ae16a58cbe7..61c948cc9b23f9c19a8bc6ac89e63acef20834e9 100644 (file)
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -117,7 +117,7 @@
 #define MISALIGNED_OK  1
 #endif
 
-#include "mdb.h"
+#include "lmdb.h"
 #include "midl.h"
 
 #if (BYTE_ORDER == LITTLE_ENDIAN) == (BYTE_ORDER == BIG_ENDIAN)

diff --git a/libraries/libmdb/mdb_copy.c b/libraries/libmdb/mdb_copy.c
index 3eae9ba7d148d6c7bea9758d3319571777619411..bd0b85911083c5aa9a1e7dc9926552ae868646c3 100644 (file)
--- a/libraries/libmdb/mdb_copy.c
+++ b/libraries/libmdb/mdb_copy.c
@@ -13,7 +13,7 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include "mdb.h"
+#include "lmdb.h"
 
 int main(int argc,char * argv[])
 {

diff --git a/libraries/libmdb/mdb_stat.c b/libraries/libmdb/mdb_stat.c
index 88ac80180704bf620422c7ac9b0bfd6b46bd6dea..4dfcf49645c15e4466ac74f0ab5d3a189ee82941 100644 (file)
--- a/libraries/libmdb/mdb_stat.c
+++ b/libraries/libmdb/mdb_stat.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "mdb.h"
+#include "lmdb.h"
 
 static void prstat(MDB_stat *ms)
 {

diff --git a/libraries/libmdb/mfree.c b/libraries/libmdb/mfree.c
index b0e6980026285a67bdea60ad45c44266865bb20b..79cce66fa6d7f5eafed4116d848baee54b01c2d8 100644 (file)
--- a/libraries/libmdb/mfree.c
+++ b/libraries/libmdb/mfree.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include "mdb.h"
+#include "lmdb.h"
 #include "midl.h"
 
 int main(int argc,char * argv[])

diff --git a/libraries/libmdb/mtest.c b/libraries/libmdb/mtest.c
index bb5ec816b628b25a967489ce5ca1559409a1cb1c..8c8dd57835b01a9bb51587639ada7f6b83110cd2 100644 (file)
--- a/libraries/libmdb/mtest.c
+++ b/libraries/libmdb/mtest.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include "mdb.h"
+#include "lmdb.h"
 
 int main(int argc,char * argv[])
 {

diff --git a/libraries/libmdb/mtest2.c b/libraries/libmdb/mtest2.c
index a0e9914417784fc631282a47409f1b2893133aab..44d1de7ccd2c88ce84fb673a2a3e361bad8942b9 100644 (file)
--- a/libraries/libmdb/mtest2.c
+++ b/libraries/libmdb/mtest2.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include "mdb.h"
+#include "lmdb.h"
 
 int main(int argc,char * argv[])
 {

diff --git a/libraries/libmdb/mtest3.c b/libraries/libmdb/mtest3.c
index eb9723ba2e58148cdcb769d15765a56a73a3f65c..c189eaa952f429a658b1742d2aed111122d4f2c1 100644 (file)
--- a/libraries/libmdb/mtest3.c
+++ b/libraries/libmdb/mtest3.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "mdb.h"
+#include "lmdb.h"
 
 int main(int argc,char * argv[])
 {

diff --git a/libraries/libmdb/mtest4.c b/libraries/libmdb/mtest4.c
index b2f5d931c61f5d1c42117e61637dc3b0de892b4b..e0ba7e20b6b6eb8dd4ca9f6fe7adaf7225bc37ca 100644 (file)
--- a/libraries/libmdb/mtest4.c
+++ b/libraries/libmdb/mtest4.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "mdb.h"
+#include "lmdb.h"
 
 int main(int argc,char * argv[])
 {

diff --git a/libraries/libmdb/mtest5.c b/libraries/libmdb/mtest5.c
index c63402ed6bf28ac032fab81e265b95c45fab4dba..bc472fa0930a519a7c26bfabd14ad3e14378c971 100644 (file)
--- a/libraries/libmdb/mtest5.c
+++ b/libraries/libmdb/mtest5.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "mdb.h"
+#include "lmdb.h"
 
 int main(int argc,char * argv[])
 {

diff --git a/libraries/libmdb/mtest6.c b/libraries/libmdb/mtest6.c
index a5bf3a2119779c49914c397126f8a76bda797056..0bf26ccc45ab93bfd9e869feb9972940abd42c41 100644 (file)
--- a/libraries/libmdb/mtest6.c
+++ b/libraries/libmdb/mtest6.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "mdb.h"
+#include "lmdb.h"
 
 char dkbuf[1024];