X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fsrchpref.h;h=cff3f95705e48c97c0700e832e537dc921ea87c2;hb=d3f433a626e18f30bb5c93d05eaf3a77fa7865f5;hp=c3fcbc51f50ce3f7e65d5a1bc5db0e8c708178da;hpb=b978170b1a98751af42e971ee8214492cba307f5;p=openldap

diff --git a/include/srchpref.h b/include/srchpref.h
index c3fcbc51f5..cff3f95705 100644
--- a/include/srchpref.h
+++ b/include/srchpref.h
@@ -1,4 +1,13 @@
 /*
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+/* Portions
  * Copyright (c) 1993, 1994 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -17,10 +26,9 @@
 #ifndef _SRCHPREF_H
 #define _SRCHPREF_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <ldap_cdefs.h>
 
+LDAP_BEGIN_DECL
 
 struct ldap_searchattr {
 	char				*sa_attrlabel;
@@ -71,36 +79,26 @@ struct ldap_searchobj {
 #define LDAP_SEARCHPREF_ERR_FILE	4
 
 
-#ifndef NEEDPROTOS
-int			ldap_init_searchprefs();
-int			ldap_init_searchprefs_buf();
-void			ldap_free_searchprefs();
-struct ldap_searchobj	*ldap_first_searchobj();
-struct ldap_searchobj	*ldap_next_searchobj();
-
-#else /* !NEEDPROTOS */
-
-LDAPFUNCDECL int
-ldap_init_searchprefs( char *file, struct ldap_searchobj **solistp );
+LDAP_F int
+ldap_init_searchprefs LDAP_P(( char *file,
+	struct ldap_searchobj **solistp ));
 
-LDAPFUNCDECL int
-ldap_init_searchprefs_buf( char *buf, long buflen,
-	struct ldap_searchobj **solistp );
+LDAP_F int
+ldap_init_searchprefs_buf LDAP_P(( char *buf,
+	long buflen,
+	struct ldap_searchobj **solistp ));
 
-LDAPFUNCDECL void
-ldap_free_searchprefs( struct ldap_searchobj *solist );
+LDAP_F void
+ldap_free_searchprefs LDAP_P(( struct ldap_searchobj *solist ));
 
-LDAPFUNCDECL struct ldap_searchobj *
-ldap_first_searchobj( struct ldap_searchobj *solist );
+LDAP_F struct ldap_searchobj *
+ldap_first_searchobj LDAP_P(( struct ldap_searchobj *solist ));
 
-LDAPFUNCDECL struct ldap_searchobj *
-ldap_next_searchobj( struct ldap_searchobj *sollist,
-	struct ldap_searchobj *so );
+LDAP_F struct ldap_searchobj *
+ldap_next_searchobj LDAP_P(( struct ldap_searchobj *sollist,
+	struct ldap_searchobj *so ));
 
-#endif /* !NEEDPROTOS */
 
+LDAP_END_DECL
 
-#ifdef __cplusplus
-}
-#endif
 #endif /* _SRCHPREF_H */