Fix select/yield

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index 20095179a61726c01191697d43243d06e058f109..c01b3acc04f59ac2ff4412317ea0a910e6e3050f 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -149,7 +149,8 @@ typedef struct lber_memory_fns {
 #define LBER_OPT_SOCKBUF_DEBUG         0x1002
 
 /* on/off values */
-#define LBER_OPT_ON            ((void *) 1)
+extern char ber_pvt_opt_on;
+#define LBER_OPT_ON            ((void *) &ber_pvt_opt_on)
 #define LBER_OPT_OFF   ((void *) 0)
 
 #define LBER_OPT_SUCCESS       (0)
@@ -602,63 +603,6 @@ ber_bvarray_free LDAP_P(( BerVarray p ));
 LBER_F( int )
 ber_bvarray_add LDAP_P(( BerVarray *p, BerValue *bv ));
 
-LBER_F( void * )
-ber_memalloc_x LDAP_P((
-       ber_len_t s, void *ctx));
-
-LBER_F( void * )
-ber_memrealloc_x LDAP_P((
-       void* p,
-       ber_len_t s, void *ctx ));
-
-LBER_F( void * )
-ber_memcalloc_x LDAP_P((
-       ber_len_t n,
-       ber_len_t s, void *ctx ));
-
-LBER_F( void )
-ber_memfree_x LDAP_P((
-       void* p, void *ctx ));
-
-LBER_F( void )
-ber_memvfree_x LDAP_P((
-       void** vector, void *ctx ));
-
-LBER_F( void )
-ber_bvfree_x LDAP_P((
-       struct berval *bv, void *ctx ));
-
-LBER_F( void )
-ber_bvecfree_x LDAP_P((
-       struct berval **bv, void *ctx ));
-
-LBER_F( int )
-ber_bvecadd_x LDAP_P((
-       struct berval ***bvec,
-       struct berval *bv, void *ctx ));
-
-LBER_F( struct berval * )
-ber_dupbv_x LDAP_P((
-       struct berval *dst, struct berval *src, void *ctx ));
-
-LBER_F( struct berval * )
-ber_str2bv_x LDAP_P((
-       LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv, void *ctx));
-
-LBER_F( struct berval * )
-ber_mem2bv_x LDAP_P((
-       LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv, void *ctx));
-
-LBER_F( char * )
-ber_strdup_x LDAP_P((
-       LDAP_CONST char *, void *ctx ));
-
-LBER_F( void )
-ber_bvarray_free_x LDAP_P(( BerVarray p, void *ctx ));
-
-LBER_F( int )
-ber_bvarray_add_x LDAP_P(( BerVarray *p, BerValue *bv, void *ctx ));
-
 #define ber_bvcmp(v1,v2) \
        ((v1)->bv_len < (v2)->bv_len \
                ? -1 : ((v1)->bv_len > (v2)->bv_len \