62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
--- openldap-2.3.37/servers/slapd/back-ldbm/ldbm.c.orig 2007-01-02 16:44:03.000000000 -0500
|
|
+++ openldap-2.3.37/servers/slapd/back-ldbm/ldbm.c 2007-08-06 05:23:44.000000000 -0400
|
|
@@ -298,10 +298,10 @@ DB_ENV *ldbm_initialize_env(const char *
|
|
home = n2;
|
|
#endif
|
|
#if DB_VERSION_X >= 0x030100
|
|
- err = env->open( env, home, envFlags, 0 );
|
|
+ err = (env->open)( env, home, envFlags, 0 );
|
|
#else
|
|
/* 3.0.x requires an extra argument */
|
|
- err = env->open( env, home, NULL, envFlags, 0 );
|
|
+ err = (env->open)( env, home, NULL, envFlags, 0 );
|
|
#endif
|
|
|
|
if ( err != 0 ) {
|
|
@@ -380,9 +380,9 @@ ldbm_open( DB_ENV *env, char *name, int
|
|
name = n2;
|
|
#endif
|
|
#if DB_VERSION_X >= 0x040111
|
|
- err = ret->open( ret, NULL, name, NULL, DB_TYPE, rw, mode);
|
|
+ err = (ret->open)( ret, NULL, name, NULL, DB_TYPE, rw, mode);
|
|
#else
|
|
- err = ret->open( ret, name, NULL, DB_TYPE, rw, mode);
|
|
+ err = (ret->open)( ret, name, NULL, DB_TYPE, rw, mode);
|
|
#endif
|
|
|
|
if ( err != 0 ) {
|
|
--- openldap-2.3.37/servers/slapd/back-bdb/back-bdb.h.orig 2007-01-03 05:36:04.000000000 +0100
|
|
+++ openldap-2.3.37/servers/slapd/back-bdb/back-bdb.h 2007-08-06 12:26:17.000000000 +0200
|
|
@@ -226,7 +226,7 @@ struct bdb_op_info {
|
|
};
|
|
|
|
#define DB_OPEN(db, file, name, type, flags, mode) \
|
|
- (db)->open(db, file, name, type, flags, mode)
|
|
+ ((db)->open)(db, file, name, type, flags, mode)
|
|
|
|
#if DB_VERSION_MAJOR < 4
|
|
#define LOCK_DETECT(env,f,t,a) lock_detect(env, f, t, a)
|
|
@@ -257,7 +257,7 @@ struct bdb_op_info {
|
|
#if DB_VERSION_FULL >= 0x04010011
|
|
#undef DB_OPEN
|
|
#define DB_OPEN(db, file, name, type, flags, mode) \
|
|
- (db)->open(db, NULL, file, name, type, flags, mode)
|
|
+ ((db)->open)(db, NULL, file, name, type, flags, mode)
|
|
#endif
|
|
|
|
#endif
|
|
--- openldap-2.3.37/build/openldap.m4.orig 2007-02-13 05:35:39.000000000 +0100
|
|
+++ openldap-2.3.37/build/openldap.m4 2007-08-06 12:27:58.000000000 +0200
|
|
@@ -627,9 +627,9 @@ main()
|
|
}
|
|
|
|
#if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1)
|
|
- rc = env->open( env, NULL, flags, 0 );
|
|
+ rc = (env->open)( env, NULL, flags, 0 );
|
|
#else
|
|
- rc = env->open( env, NULL, NULL, flags, 0 );
|
|
+ rc = (env->open)( env, NULL, NULL, flags, 0 );
|
|
#endif
|
|
|
|
if ( rc == 0 ) {
|