Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
HAMANO Tsukasa
OpenLDAP
Commits
13f3bcd5
Commit
13f3bcd5
authored
Nov 30, 2012
by
Howard Chu
Browse files
Rename libmdb to liblmdb, lmdb.h
Avoid naming conflicts with other mdb* packages. Bump version to 0.9.5
parent
f1655071
Changes
12
Hide whitespace changes
Inline
Side-by-side
libraries/libmdb/Makefile
View file @
13f3bcd5
...
...
@@ -6,7 +6,7 @@ LDLIBS =
SOLIBS
=
PROGS
=
mdb_stat mdb_copy mtest mtest2 mtest3 mtest4 mtest5
all
:
libmdb.a libmdb.so $(PROGS)
all
:
lib
l
mdb.a lib
l
mdb.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
lib
l
mdb.a
:
mdb.o midl.o
ar rs
$@
mdb.o midl.o
libmdb.so
:
mdb.o midl.o
lib
l
mdb.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 lib
l
mdb.a
mdb_copy
:
mdb_copy.o lib
l
mdb.a
mtest
:
mtest.o lib
l
mdb.a
mtest2
:
mtest2.o lib
l
mdb.a
mtest3
:
mtest3.o lib
l
mdb.a
mtest4
:
mtest4.o lib
l
mdb.a
mtest5
:
mtest5.o lib
l
mdb.a
mtest6
:
mtest6.o lib
l
mdb.a
mfree
:
mfree.o lib
l
mdb.a
mdb.o
:
mdb.c
l
mdb.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
l
mdb.h
$(CC)
$(CFLAGS)
$(CPPFLAGS)
-c
$<
libraries/libmdb/mdb.h
→
libraries/libmdb/
l
mdb.h
View file @
13f3bcd5
/** @file mdb.h
* @brief memory-mapped database library
/** @file
l
mdb.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 _
L
MDB_H_
#define _
L
MDB_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 "
Sept
ember
14
, 2012"
#define MDB_VERSION_DATE "
Nov
ember
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
/* _
L
MDB_H_ */
libraries/libmdb/mdb.c
View file @
13f3bcd5
...
...
@@ -117,7 +117,7 @@
#define MISALIGNED_OK 1
#endif
#include
"mdb.h"
#include
"
l
mdb.h"
#include
"midl.h"
#if (BYTE_ORDER == LITTLE_ENDIAN) == (BYTE_ORDER == BIG_ENDIAN)
...
...
libraries/libmdb/mdb_copy.c
View file @
13f3bcd5
...
...
@@ -13,7 +13,7 @@
*/
#include
<stdio.h>
#include
<stdlib.h>
#include
"mdb.h"
#include
"
l
mdb.h"
int
main
(
int
argc
,
char
*
argv
[])
{
...
...
libraries/libmdb/mdb_stat.c
View file @
13f3bcd5
...
...
@@ -15,7 +15,7 @@
#include
<stdlib.h>
#include
<string.h>
#include
<unistd.h>
#include
"mdb.h"
#include
"
l
mdb.h"
static
void
prstat
(
MDB_stat
*
ms
)
{
...
...
libraries/libmdb/mfree.c
View file @
13f3bcd5
...
...
@@ -15,7 +15,7 @@
#include
<stdio.h>
#include
<stdlib.h>
#include
<time.h>
#include
"mdb.h"
#include
"
l
mdb.h"
#include
"midl.h"
int
main
(
int
argc
,
char
*
argv
[])
...
...
libraries/libmdb/mtest.c
View file @
13f3bcd5
...
...
@@ -15,7 +15,7 @@
#include
<stdio.h>
#include
<stdlib.h>
#include
<time.h>
#include
"mdb.h"
#include
"
l
mdb.h"
int
main
(
int
argc
,
char
*
argv
[])
{
...
...
libraries/libmdb/mtest2.c
View file @
13f3bcd5
...
...
@@ -18,7 +18,7 @@
#include
<stdio.h>
#include
<stdlib.h>
#include
<time.h>
#include
"mdb.h"
#include
"
l
mdb.h"
int
main
(
int
argc
,
char
*
argv
[])
{
...
...
libraries/libmdb/mtest3.c
View file @
13f3bcd5
...
...
@@ -18,7 +18,7 @@
#include
<stdlib.h>
#include
<string.h>
#include
<time.h>
#include
"mdb.h"
#include
"
l
mdb.h"
int
main
(
int
argc
,
char
*
argv
[])
{
...
...
libraries/libmdb/mtest4.c
View file @
13f3bcd5
...
...
@@ -18,7 +18,7 @@
#include
<stdlib.h>
#include
<string.h>
#include
<time.h>
#include
"mdb.h"
#include
"
l
mdb.h"
int
main
(
int
argc
,
char
*
argv
[])
{
...
...
libraries/libmdb/mtest5.c
View file @
13f3bcd5
...
...
@@ -18,7 +18,7 @@
#include
<stdlib.h>
#include
<string.h>
#include
<time.h>
#include
"mdb.h"
#include
"
l
mdb.h"
int
main
(
int
argc
,
char
*
argv
[])
{
...
...
libraries/libmdb/mtest6.c
View file @
13f3bcd5
...
...
@@ -18,7 +18,7 @@
#include
<stdlib.h>
#include
<string.h>
#include
<time.h>
#include
"mdb.h"
#include
"
l
mdb.h"
char
dkbuf
[
1024
];
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment