Move extern declarations to headers.

Update NT portable.h and features.h

diff --git a/include/ldap_features.h.nt b/include/ldap_features.h.nt
index 78ae1045179594dd470098045acff2b95b4373c6..a4673c29336285a2dc47bfbbf0eec8f190947916 100644 (file)
--- a/include/ldap_features.h.nt
+++ b/include/ldap_features.h.nt
@@ -8,7 +8,7 @@
 #define LDAP_API_FEATURE_X_OPENLDAP_DEBUG LDAP_API_VENDOR_VERSION
 
 /* OpenLDAP v2 DNS */
-#define LDAP_API_FEATURE_X_OPENLDAP_V2_DNS LDAP_API_VENDOR_VERSION
+/* #undef LDAP_API_FEATURE_X_OPENLDAP_V2_DNS */
 
 /* OpenLDAP v2 Referrals */
 #define LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS LDAP_API_VENDOR_VERSION

diff --git a/include/portable.h.nt b/include/portable.h.nt
index 780aa646d927188529e6101d15aafb5c4cd4215f..ba45d908cd367b3a1742eaa8c6a55429b46c708a 100644 (file)
--- a/include/portable.h.nt
+++ b/include/portable.h.nt
@@ -32,6 +32,9 @@ is provided ``as is'' without express or implied warranty.
 #ifndef _LDAP_PORTABLE_H
 #define _LDAP_PORTABLE_H
 
+/* MSVC5 doesn't define _STDC_, but requires prototypes */
+#define __NEED_PROTOTYPES 1
+
 /* we installed Henry Spencer's REGEX */
 #define HAVE_REGEX_H 1
 

diff --git a/libraries/libldap/disptmpl.c b/libraries/libldap/disptmpl.c
index a15640846dafdfb1d40154bbbed747892f55fddb..54b493e7c7cb51891553ae98dd06cbe3faaeca11 100644 (file)
--- a/libraries/libldap/disptmpl.c
+++ b/libraries/libldap/disptmpl.c
@@ -33,8 +33,6 @@
 static void free_disptmpl LDAP_P(( struct ldap_disptmpl *tmpl ));
 static int read_next_tmpl LDAP_P(( char **bufp, long *blenp,
        struct ldap_disptmpl **tmplp, int dtversion ));
-int next_line_tokens LDAP_P(( char **bufp, long *blenp, char ***toksp ));
-void free_strarray LDAP_P(( char **sap ));
 
 static char            *tmploptions[] = {
     "addable", "modrdn",

diff --git a/libraries/libldap/dsparse.c b/libraries/libldap/dsparse.c
index 3fdd7b9c44a3cbfc8265449890ea40ebdb19d0cd..394e61ec34dbfc214bcf300774a33f4c90242e20 100644 (file)
--- a/libraries/libldap/dsparse.c
+++ b/libraries/libldap/dsparse.c
@@ -30,8 +30,6 @@
 
 #include "ldap-int.h"
 
-int next_line_tokens LDAP_P(( char **bufp, long *blenp, char ***toksp ));
-void free_strarray LDAP_P(( char **sap ));
 static int next_line LDAP_P(( char **bufp, long *blenp, char **linep ));
 static char *next_token LDAP_P(( char ** sp ));
 

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index c8b0d3e8a03e0e09407fb0d2c735bc684930b43b..4fe8f855c62d49a7963ba2912a127b1c668a9534 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -79,10 +79,10 @@ ldap_err2string( int err )
        return( "Unknown error" );
 }
 
-#ifdef LDAP_LIBUI
 void
 ldap_perror( LDAP *ld, char *s )
 {
+#ifdef LDAP_LIBUI
        int     i;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_perror\n", 0, 0, 0 );
@@ -109,17 +109,8 @@ ldap_perror( LDAP *ld, char *s )
 
        fprintf( stderr, "%s: Not an LDAP errno %d\n", s, ld->ld_errno );
        fflush( stderr );
-}
-
-#else
-
-void
-ldap_perror( LDAP *ld, char *s )
-{
-}
-
 #endif /* !LDAP_LIBUI */
-
+}
 
 int
 ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )

diff --git a/libraries/libldap/getfilter.c b/libraries/libldap/getfilter.c
index dc053ed56ad5a89ee81511bee1d73c5d9c75586d..b6272659c4366a982b99a2817c87b19361b03375 100644 (file)
--- a/libraries/libldap/getfilter.c
+++ b/libraries/libldap/getfilter.c
@@ -28,8 +28,6 @@ static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of
 #include "ldap-int.h"
 
 static int break_into_words LDAP_P(( char *str, char *delims, char ***wordsp ));
-int next_line_tokens LDAP_P(( char **bufp, long *blenp, char ***toksp ));
-void free_strarray LDAP_P(( char **sap ));
 
 #define FILT_MAX_LINE_LEN      1024
 

diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c
index 13cb38eff78644c091418b189f05defcac3e4638..316b9080207958927ec0ee8c24b2b362d2bf4023 100644 (file)
--- a/libraries/libldap/kbind.c
+++ b/libraries/libldap/kbind.c
@@ -40,7 +40,6 @@ ldap_kerberos_bind1( LDAP *ld, char *dn )
        BerElement      *ber;
        char            *cred;
        int             rc, credlen;
-       char            *ldap_get_kerberosv4_credentials();
 #ifdef STR_TRANSLATION
        int             str_translation_on;
 #endif /* STR_TRANSLATION */
@@ -147,7 +146,6 @@ ldap_kerberos_bind2( LDAP *ld, char *dn )
        BerElement      *ber;
        char            *cred;
        int             rc, credlen;
-       char            *ldap_get_kerberosv4_credentials();
 #ifdef STR_TRANSLATION
        int             str_translation_on;
 #endif /* STR_TRANSLATION */

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index a047cc54e83a628044c21f2b44eced9c33d346d6..64f4e7f913e77a6f77c00ffdf3b931cd00bd98cf 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -155,6 +155,11 @@ void ldap_add_request_to_cache LDAP_P(( LDAP *ld, unsigned long msgtype,
 void ldap_add_result_to_cache LDAP_P(( LDAP *ld, LDAPMessage *result ));
 int ldap_check_cache LDAP_P(( LDAP *ld, unsigned long msgtype, BerElement *request ));
 
+/*
+ * in dparse.c
+ */
+int next_line_tokens LDAP_P(( char **bufp, long *blenp, char ***toksp ));
+void free_strarray LDAP_P(( char **sap ));
 
 #ifdef HAVE_KERBEROS
 /*
@@ -257,8 +262,8 @@ int ldap_t61_to_8859( char **bufp, unsigned long *buflenp, int free_input );
 extern 
 int ldap_8859_to_t61( char **bufp, unsigned long *buflenp, int free_input );
 #endif /* LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET */
+ #endif /* STR_TRANSLATION && LDAP_DEFAULT_CHARSET */
 
 LDAP_END_DECL
-#endif /* STR_TRANSLATION && LDAP_DEFAULT_CHARSET */
 
 #endif /* _LDAP_INT_H */

diff --git a/libraries/libldap/srchpref.c b/libraries/libldap/srchpref.c
index 8920097c93c7c86ac3dca2be08e74800ac956a11..4210cab6612fc606ac396781895cb155d1ef6a68 100644 (file)
--- a/libraries/libldap/srchpref.c
+++ b/libraries/libldap/srchpref.c
@@ -30,8 +30,6 @@
 #include "ldap-int.h"
 #include "srchpref.h"
 
-int next_line_tokens LDAP_P(( char **bufp, long *blenp, char ***toksp ));
-void free_strarray LDAP_P(( char **sap ));
 static void free_searchobj LDAP_P(( struct ldap_searchobj *so ));
 static int read_next_searchobj LDAP_P(( char **bufp, long *blenp,
        struct ldap_searchobj **sop, int soversion ));

diff --git a/libraries/libldap/ufn.c b/libraries/libldap/ufn.c
index d8cfa25f7cf2d31458feab9ba39d8e9e6502885e..a5a279b42f8515a10b54fac06649573f17406260 100644 (file)
--- a/libraries/libldap/ufn.c
+++ b/libraries/libldap/ufn.c
@@ -32,7 +32,6 @@ static LDAPMessage *ldap_msg_merge LDAP_P(( LDAP *ld, LDAPMessage *a, LDAPMessag
 static LDAPMessage *ldap_ufn_expand LDAP_P(( LDAP *ld, cancelptype cancelproc,
        void *cancelparm, char **dns, char *filter, int scope,
        char **attrs, int aonly, int *err ));
-LDAPFiltDesc *ldap_ufn_setfilter LDAP_P(( LDAP *ld, char *fname ));
 
 /*
  * ldap_ufn_search_ctx - do user friendly searching; provide cancel feature;