From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sun, 18 Sep 2011 19:49:25 +0000 (+0200)
Subject: Cleanup ISO C compatibility for recent commits
X-Git-Tag: OPENLDAP_REL_ENG_2_4_27~118
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=19ce3b2e154a0ecc2eec130e4d6b57dc9ead0ddb;p=openldap

Cleanup ISO C compatibility for recent commits
---

diff --git a/servers/slapd/back-mdb/bind.c b/servers/slapd/back-mdb/bind.c
index b828406ca9..9a00b99848 100644
--- a/servers/slapd/back-mdb/bind.c
+++ b/servers/slapd/back-mdb/bind.c
@@ -32,7 +32,7 @@ mdb_bind( Operation *op, SlapReply *rs )
 	AttributeDescription *password = slap_schema.si_ad_userPassword;
 
 	MDB_txn		*rtxn;
-	mdb_op_info	opinfo = {0}, *moi = &opinfo;
+	mdb_op_info	opinfo = {{{0}}}, *moi = &opinfo;
 
 	Debug( LDAP_DEBUG_ARGS,
 		"==> " LDAP_XSTRING(mdb_bind) ": dn: %s\n",
diff --git a/servers/slapd/back-mdb/compare.c b/servers/slapd/back-mdb/compare.c
index c5c45d256b..9ed7f9bde5 100644
--- a/servers/slapd/back-mdb/compare.c
+++ b/servers/slapd/back-mdb/compare.c
@@ -29,7 +29,7 @@ mdb_compare( Operation *op, SlapReply *rs )
 	int		manageDSAit = get_manageDSAit( op );
 
 	MDB_txn		*rtxn;
-	mdb_op_info	opinfo = {0}, *moi = &opinfo;
+	mdb_op_info	opinfo = {{{0}}}, *moi = &opinfo;
 
 	rs->sr_err = mdb_opinfo_get(op, mdb, 1, &moi);
 	switch(rs->sr_err) {
diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c
index b21dbee35e..8e9df9a039 100644
--- a/servers/slapd/back-mdb/config.c
+++ b/servers/slapd/back-mdb/config.c
@@ -38,7 +38,7 @@ enum {
 	MDB_MAXREADERS,
 	MDB_MAXSIZE,
 	MDB_MODE,
-	MDB_SSTACK,
+	MDB_SSTACK
 };
 
 static ConfigTable mdbcfg[] = {
diff --git a/servers/slapd/back-mdb/operational.c b/servers/slapd/back-mdb/operational.c
index 28f6e7b4aa..56df5a750a 100644
--- a/servers/slapd/back-mdb/operational.c
+++ b/servers/slapd/back-mdb/operational.c
@@ -36,7 +36,7 @@ mdb_hasSubordinates(
 {
 	struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
 	MDB_txn		*rtxn;
-	mdb_op_info	opinfo = {0}, *moi = &opinfo;
+	mdb_op_info	opinfo = {{{0}}}, *moi = &opinfo;
 	int		rc;
 	
 	assert( e != NULL );
diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
index a0ea03f063..5bac5501c9 100644
--- a/servers/slapd/back-mdb/search.c
+++ b/servers/slapd/back-mdb/search.c
@@ -294,7 +294,7 @@ mdb_search( Operation *op, SlapReply *rs )
 	IdScopes	isc;
 	MDB_cursor	*mci;
 
-	mdb_op_info	opinfo = {0}, *moi = &opinfo;
+	mdb_op_info	opinfo = {{{0}}}, *moi = &opinfo;
 	MDB_txn			*ltid = NULL;
 
 	Debug( LDAP_DEBUG_TRACE, "=> " LDAP_XSTRING(mdb_search) "\n", 0, 0, 0);