Add LDAP_DEPRECATED macro

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

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 1ba930d1e57cf1194911e40976033385b762c09d..02523bf0b74e6be0029bf53fb6e6d415de36c1f8 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -1,11 +1,19 @@
 /*  ldap-int.h - defines & prototypes internal to the LDAP library */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*  Portions
- *  Copyright (c) 1995 Regents of the University of Michigan.
+/*  Portions Copyright (c) 1995 Regents of the University of Michigan.
  *  All rights reserved.
  */
 
@@ -48,7 +56,7 @@
         *  Note: Deallocate structure when the process exits
         */
 #      define LDAP_INT_GLOBAL_OPT() ldap_int_global_opt()
-   struct ldapoptions *ldap_int_global_opt(void);
+       struct ldapoptions *ldap_int_global_opt(void);
 #else
 #      define LDAP_INT_GLOBAL_OPT() (&ldap_int_global_options)
 #endif
@@ -76,6 +84,7 @@
 
 #endif /* LDAP_DEBUG */
 
+#define LDAP_DEPRECATED 1
 #include "ldap.h"
 
 #include "ldap_pvt.h"
@@ -402,10 +411,6 @@ LDAP_F (int) ldap_check_cache LDAP_P(( LDAP *ld, ber_tag_t msgtype, BerElement *
 /*
  * in controls.c
  */
-LDAP_F (int) ldap_int_get_controls LDAP_P((
-       BerElement *be,
-       LDAPControl ***ctrlsp));
-
 LDAP_F (int) ldap_int_put_controls LDAP_P((
        LDAP *ld,
        LDAPControl *const *ctrls,