Remove redefine on MSC

[openldap] / include / srchpref.h

diff --git a/include/srchpref.h b/include/srchpref.h
index 6b26b06d41e054ce34dc7ae149c4e62cbad845d4..eb6345b61afe95e637686deef9732ff3fc70544f 100644 (file)
--- a/include/srchpref.h
+++ b/include/srchpref.h
@@ -1,4 +1,14 @@
+/* $OpenLDAP$ */
 /*
+ * Copyright 1998-2000 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.
  *
@@ -51,8 +61,6 @@ struct ldap_searchobj {
        struct ldap_searchobj           *so_next;
 };
 
-#define NULLSEARCHOBJ                  ((struct ldap_searchobj *)0)
-
 /*
  * global search object options
  */
@@ -70,22 +78,22 @@ struct ldap_searchobj {
 #define LDAP_SEARCHPREF_ERR_FILE       4
 
 
-LDAP_F int
+LDAP_F( int )
 ldap_init_searchprefs LDAP_P(( char *file,
        struct ldap_searchobj **solistp ));
 
-LDAP_F int
+LDAP_F( int )
 ldap_init_searchprefs_buf LDAP_P(( char *buf,
-       long buflen,
+       ber_len_t buflen,
        struct ldap_searchobj **solistp ));
 
-LDAP_F void
+LDAP_F( void )
 ldap_free_searchprefs LDAP_P(( struct ldap_searchobj *solist ));
 
-LDAP_F struct ldap_searchobj *
+LDAP_F( struct ldap_searchobj * )
 ldap_first_searchobj LDAP_P(( struct ldap_searchobj *solist ));
 
-LDAP_F struct ldap_searchobj *
+LDAP_F( struct ldap_searchobj * )
 ldap_next_searchobj LDAP_P(( struct ldap_searchobj *sollist,
        struct ldap_searchobj *so ));