Merge remote branch 'origin/mdb.master'

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

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index b350224f57a5c7c0f0f9632efdc0785780bfa051..98a2ead3fba6ea10b343c440207ffd38861b154f 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -175,6 +175,7 @@ typedef struct ldaplist {
  * structure representing get/set'able options
  * which have global defaults.
  * Protect access to this struct with ldo_mutex
+ * ldap_log.h:ldapoptions_prefix must match the head of this struct.
  */
 struct ldapoptions {
        short ldo_valid;
@@ -189,7 +190,6 @@ struct ldapoptions {
 #define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL
 #else
 #define LDAP_LDO_MUTEX_NULLARG
-#define LDAP_PVT_MUTEX_FIRSTCREATE(m)  ((void) 0)
 #endif
 
 #ifdef LDAP_CONNECTIONLESS
@@ -587,6 +587,7 @@ LDAP_F (int) ldap_int_next_line_tokens LDAP_P(( char **bufp, ber_len_t *blenp, c
 LDAP_F (int) ldap_open_defconn( LDAP *ld );
 LDAP_F (int) ldap_int_open_connection( LDAP *ld,
        LDAPConn *conn, LDAPURLDesc *srvlist, int async );
+LDAP_F (int) ldap_int_check_async_open( LDAP *ld, ber_socket_t sd );
 
 /*
  * in os-ip.c