Fix select/yield

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index 83bd5d96f05b1047945432a4667e84556ac7ba04..e28755214cde48173b70c9412f0c3983d8242e25 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -144,7 +144,7 @@ LDAP_BEGIN_DECL
 #define        LDAP_OPT_X_SASL_MAXBUFSIZE              0x6109
 
 /* on/off values */
-#define LDAP_OPT_ON            ((void *) 1)
+#define LDAP_OPT_ON            ((void *) &ber_pvt_opt_on)
 #define LDAP_OPT_OFF   ((void *) 0)
 
 /*
@@ -202,9 +202,7 @@ typedef struct ldapcontrol {
 #define LDAP_CUP_COOKIE_OID                            "1.3.6.1.4.1.4203.666.10.1"
 #endif
 
-#ifdef LDAP_DEVEL
 #define LDAP_SYNC 2
-#endif
 #ifdef LDAP_SYNC
 #define LDAP_SYNCREPL 1
 #define LDAP_CONTROL_SYNC              "1.3.6.1.4.1.4203.666.5.6"
@@ -330,8 +328,7 @@ typedef struct ldapcontrol {
 #define LDAP_RES_RENAME                LDAP_RES_MODDN  /* application + constructed */
 #define LDAP_RES_COMPARE       ((ber_tag_t) 0x6fU)     /* application + constructed */
 #define LDAP_RES_EXTENDED      ((ber_tag_t) 0x78U)     /* V3: application + constructed */
-#define LDAP_RES_EXTENDED_PARTIAL      ((ber_tag_t) 0x79U)     /* V3+: application + constructed */
-#define LDAP_RES_INTERMEDIATE_RESP     ((ber_tag_t) 0x7aU)
+#define LDAP_RES_INTERMEDIATE  ((ber_tag_t) 0x79U) /* V3+: application + constructed */
 
 #define LDAP_RES_ANY                   (-1)
 #define LDAP_RES_UNSOLICITED   (0)
@@ -692,7 +689,7 @@ ldap_parse_extended_result LDAP_P((
        int                             freeit ));
 
 LDAP_F( int )
-ldap_parse_extended_partial LDAP_P((
+ldap_parse_intermediate LDAP_P((
        LDAP                    *ld,
        LDAPMessage             *res,
        char                    **retoidp,
@@ -700,14 +697,6 @@ ldap_parse_extended_partial LDAP_P((
        LDAPControl             ***serverctrls,
        int                             freeit ));
 
-LDAP_F( int )
-ldap_parse_intermediate_resp_result LDAP_P((
-       LDAP                    *ld,
-       LDAPMessage             *res,
-       char                    **retoidp,
-       struct berval   **retdatap,
-       int                             freeit ));
-
 /*
  * in abandon.c:
  */