Remove redefine on MSC

[openldap] / include / srchpref.h

diff --git a/include/srchpref.h b/include/srchpref.h
index cff3f95705e48c97c0700e832e537dc921ea87c2..eb6345b61afe95e637686deef9732ff3fc70544f 100644 (file)
--- a/include/srchpref.h
+++ b/include/srchpref.h
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -60,8 +61,6 @@ struct ldap_searchobj {
        struct ldap_searchobj           *so_next;
 };
 
-#define NULLSEARCHOBJ                  ((struct ldap_searchobj *)0)
-
 /*
  * global search object options
  */
@@ -79,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 ));