mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-09 02:52:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

workaround open() being a macro in glibc 2.6 (ITS#5075)

Browse Source
This commit is contained in:
Pierangelo Masarati 2007-08-06 12:57:24 +00:00
parent 5f386d3e31
commit dbad13ead2
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/openldap.m4
View File

@ -628,9 +628,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 ) {

4
configure vendored
View File

@ -31147,9 +31147,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 ) {

4
servers/slapd/back-bdb/back-bdb.h
View File

@ -239,7 +239,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)
@ -270,7 +270,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

2
servers/slapd/back-bdb/init.c
View File

@ -298,7 +298,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 ) {