--- util_ldap.c	Wed Oct 09 00:48:08 2002
+++ d:\projects\2.x\httpd-2.1\modules\experimental\util_ldap.c	Fri Nov 22 05:51:02 2002
@@ -205,7 +205,7 @@
  * with the pool cleanup function - causing the LDAP connections to be
  * shut down cleanly on graceful restart.
  */
-apr_status_t util_ldap_connection_destroy(void *param)
+LDAP_DECLARE(apr_status_t) util_ldap_connection_destroy(void *param)
 {
     util_ldap_connection_t *ldc = param;
 
@@ -1011,7 +1011,7 @@
     return NULL;
 }
 
-#ifdef APU_HAS_LDAPSSL_CLIENT_INIT
+#ifdef APU_HAS_LDAP_NETSCAPE_SSL
 static const char *util_ldap_set_certdbpath(cmd_parms *cmd, void *dummy, const char *path)
 {
     util_ldap_state_t *st = 
@@ -1092,7 +1092,7 @@
                   "Sets the maximum time (in seconds) that an item is cached in the LDAP "
                   "operation cache. Zero means no limit. Defaults to 600 seconds (10 minutes)."),
 
-#ifdef APU_HAS_LDAPSSL_CLIENT_INIT
+#ifdef APU_HAS_LDAP_NETSCAPE_SSL
     AP_INIT_TAKE1("LDAPCertDBPath", util_ldap_set_certdbpath, NULL, RSRC_CONF,
                   "Specifies the file containing Certificate Authority certificates "
                   "for validating secure LDAP server certificates. This file must be the "