allow array of more generic syntaxes

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 41bca5cb84a48bdd805d6fa8bf665503b55e6b5b..b745cd3c35f7f85071301d18f643c9a6839b98e3 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -367,10 +367,7 @@ Connection * connection_init(
        int flags,
        slap_ssf_t ssf,
        struct berval *authid
-#ifdef LDAP_PF_LOCAL_SENDMSG
-       , struct berval *peerbv
-#endif
-)
+       LDAP_PF_LOCAL_SENDMSG_ARG(struct berval *peerbv))
 {
        unsigned long id;
        Connection *c;
@@ -1203,15 +1200,11 @@ int connection_client_setup(
        ldap_pvt_thread_start_t *func,
        void *arg )
 {
-       int rc;
        Connection *c;
 
        c = connection_init( s, (Listener *)&dummy_list, "", "",
                CONN_IS_CLIENT, 0, NULL
-#ifdef LDAP_PF_LOCAL_SENDMSG
-               , NULL
-#endif
-               );
+               LDAP_PF_LOCAL_SENDMSG_ARG(NULL));
        if ( !c ) return -1;
 
        c->c_clientfunc = func;
@@ -1459,7 +1452,7 @@ int connection_read(ber_socket_t s)
        }
 #ifdef DATA_READY_LOOP
        while( !rc && ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ));
-#elif CONNECTION_INPUT_LOOP
+#elif defined CONNECTION_INPUT_LOOP
        while(!rc);
 #else
        while(0);