Updates for MSVC 5.0. Fix libraries names to be ol{ber,dap,..}32.lib.

[openldap] / libraries / libldap / ldap-int.h

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index afb740303912f56cb433a4e5b5bf6d4ae97106f5..e8c44098fd15d83285d08be282968d11e19ce0d6 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -19,11 +19,16 @@
 #include "../liblber/lber-int.h"
 
 #define ldap_debug     (openldap_ldap_global_options.ldo_debug)
+#undef Debug
+#define Debug( level, fmt, arg1, arg2, arg3 ) \
+       ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) )
 
 #include "ldap_log.h"
 
 #include "ldap.h"
 
+#include "ldap_pvt.h"
+
 LDAP_BEGIN_DECL
 
 #define LDAP_URL_PREFIX         "ldap://"
@@ -74,13 +79,13 @@ struct ldapmsg {
  * which have global defaults.
  */
 struct ldapoptions {
+       int             ldo_debug;
+
        int             ldo_version;    /* version to connect at */
        int             ldo_deref;
        int             ldo_timelimit;
        int             ldo_sizelimit;
 
-       int             ldo_debug;
-
        int             ldo_defport;
        char*   ldo_defbase;
        char*   ldo_defhost;
@@ -237,6 +242,11 @@ extern int openldap_ldap_initialized;
 extern struct ldapoptions openldap_ldap_global_options;
 void openldap_ldap_initialize LDAP_P((void));
 
+/*
+ * in print.c
+ */
+int ldap_log_printf LDAP_P((LDAP *ld, int level, char *fmt, ...));
+
 /*
  * in cache.c
  */
@@ -250,6 +260,7 @@ int ldap_check_cache LDAP_P(( LDAP *ld, unsigned long msgtype, BerElement *reque
  */
 LDAPControl *ldap_control_dup LDAP_P(( LDAPControl *ctrl ));
 LDAPControl **ldap_controls_dup LDAP_P(( LDAPControl **ctrl ));
+int ldap_get_ber_controls LDAP_P(( BerElement *be, LDAPControl ***cp));
 
 /*
  * in dsparse.c
@@ -370,30 +381,6 @@ 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 */
 
-/*
- * in util_r.c
- * 
- */
-
-struct hostent;        /* avoid pulling in <netdb.h> */
-
-extern char *ldap_int_strtok( char *str, const char *delim, char **pos );
-extern char *ldap_int_ctime( const time_t *tp, char *buf );
-extern int ldap_int_gethostbyname_a(
-       const char *name, 
-       struct hostent *resbuf,
-       char **buf,
-       struct hostent **result,
-       int *herrno_ptr );
-extern int ldap_int_gethostbyaddr_a(
-       const char *addr,
-       int len,
-       int type,
-       struct hostent *resbuf,
-       char **buf,
-       struct hostent **result,
-       int *herrno_ptr );
-
 LDAP_END_DECL
 
 #endif /* _LDAP_INT_H */