X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fldap-int.h;h=591c3e4e74cebf992273719649df51dd4b69dea1;hb=7887ef7e92a4b91d20814242322dfc33d3ebb0ee;hp=e4b4983177330d4206dc6de302fe1e1f0e19b6d2;hpb=e5eb270e6c04102f42545d34efdce318b439f5ab;p=openldap

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index e4b4983177..591c3e4e74 100644
--- 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
@@ -18,16 +18,10 @@
 
 #include "../liblber/lber-int.h"
 
-/*
- * Windows does not preprocess correctly unless
- * this #include precedes queue.h
- */
 #ifdef LDAP_R_COMPILE
 #include <ldap_pvt_thread.h>
 #endif
 
-#include <ac/queue.h>
-
 #ifdef HAVE_CYRUS_SASL
 	/* the need for this should be removed */
 #include <sasl.h>
@@ -61,7 +55,9 @@
 
 #undef Debug
 #define Debug( level, fmt, arg1, arg2, arg3 ) \
-	ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) )
+	do { if ( ldap_debug & level ) \
+	ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) ); \
+	} while ( 0 )
 
 #define LDAP_Debug( subsystem, level, fmt, arg1, arg2, arg3 )\
 	ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) )
@@ -335,13 +331,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)))
@@ -437,7 +426,7 @@ LDAP_F (char *) ldap_host_connected_to( Sockbuf *sb );
 #endif
 
 LDAP_F (void) ldap_int_ip_init( void );
-LDAP_F (int) do_ldap_select( LDAP *ld, struct timeval *timeout );
+LDAP_F (int) ldap_int_select( LDAP *ld, struct timeval *timeout );
 LDAP_F (void *) ldap_new_select_info( void );
 LDAP_F (void) ldap_free_select_info( void *sip );
 LDAP_F (void) ldap_mark_select_write( LDAP *ld, Sockbuf *sb );
@@ -495,10 +484,9 @@ LDAP_F (BerElement *) ldap_build_search_req LDAP_P((
 	ber_int_t timelimit,
 	ber_int_t sizelimit ));
 
-/*
- * in string.c
- */
-	/* see <ac/string.h> */
+LDAP_F( int ) ldap_int_put_filter LDAP_P((
+	BerElement *ber,
+	const char *str ));
 
 /*
  * in unbind.c
@@ -575,6 +563,11 @@ LDAP_F (int) ldap_int_sasl_bind LDAP_P((
 	LDAP_SASL_INTERACT_PROC *interact,
 	void *defaults ));
 
+/* in schema.c */
+LDAP_F (char *) ldap_int_parse_numericoid LDAP_P((
+	const char **sp,
+	int *code,
+	const int flags ));
 
 /*
  * in tls.c