Commit 2a5ad817 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

import fix to ITS#5075

parent 2b32c8bb
......@@ -10,6 +10,8 @@ OpenLDAP 2.3.38 Engineering
Fixed slapo-syncprov uninit'd vars (ITS#5048,#5049)
Fixed libldap ldap_add_result_entry (ITS#5056)
Removed lint
Build Environment
Fixed macro definition of open() in glibc 2.6 (ITS#5075)
OpenLDAP 2.3.37 Release (2007/07/20)
Fixed slapd-glue/syncprov interaction (ITS#4623)
......
......@@ -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 ) {
......
......@@ -35722,9 +35722,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 ) {
......@@ -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
......
......@@ -288,7 +288,7 @@ shm_retry:
bdb->bi_dbenv->set_shm_key( bdb->bi_dbenv, bdb->bi_shm_key );
flags |= DB_SYSTEM_MEM;
}
rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome,
rc = (bdb->bi_dbenv->open)( bdb->bi_dbenv, dbhome,
flags | do_recover, bdb->bi_dbenv_mode );
if ( rc ) {
......
......@@ -298,10 +298,10 @@ DB_ENV *ldbm_initialize_env(const char *home, int dbcachesize, int *envdirok)
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 rw, int mode, int dbcachesize )
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 ) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment