prepare for ldap_bv2dn()

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

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index dbcd5ab8e66c409a5ed920bab155006474f48b41..2b9df3da604843911f2099f515a15de50f210b9b 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -1,7 +1,7 @@
 /*  ldap-int.h - defines & prototypes internal to the LDAP library */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -22,11 +22,13 @@
 #include <ldap_pvt_thread.h>
 #endif
 
-#include <ldap_queue.h>
-
 #ifdef HAVE_CYRUS_SASL
        /* the need for this should be removed */
+#ifdef HAVE_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
 #include <sasl.h>
+#endif
 
 #define SASL_MAX_BUFF_SIZE     65536
 #define SASL_MIN_BUFF_SIZE     4096
@@ -333,13 +335,6 @@ LDAP_F ( void ) ldap_int_initialize_global_options LDAP_P((
 
 /* memory.c */
        /* simple macros to realloc for now */
-#define LDAP_INT_MALLOC(s)             (LBER_MALLOC((s)))
-#define LDAP_INT_CALLOC(n,s)   (LBER_CALLOC((n),(s)))
-#define LDAP_INT_REALLOC(p,s)  (LBER_REALLOC((p),(s)))
-#define LDAP_INT_FREE(p)               (LBER_FREE((p)))
-#define LDAP_INT_VFREE(v)              (LBER_VFREE((void **)(v)))
-#define LDAP_INT_STRDUP(s)             (LBER_STRDUP((s)))
-
 #define LDAP_MALLOC(s)         (LBER_MALLOC((s)))
 #define LDAP_CALLOC(n,s)       (LBER_CALLOC((n),(s)))
 #define LDAP_REALLOC(p,s)      (LBER_REALLOC((p),(s)))
@@ -495,7 +490,7 @@ LDAP_F (BerElement *) ldap_build_search_req LDAP_P((
 
 LDAP_F( int ) ldap_int_put_filter LDAP_P((
        BerElement *ber,
-       char *str ));
+       const char *str ));
 
 /*
  * in unbind.c