Fix IRIX sc_mask conflict

[openldap] / servers / slapd / sets.h

diff --git a/servers/slapd/sets.h b/servers/slapd/sets.h
index 0f2129afb701c26aba55830460e45f5ae46cd58b..569efa90b60234d9fa740b1a0a5fbe69cb6f01ce 100644 (file)
--- a/servers/slapd/sets.h
+++ b/servers/slapd/sets.h
@@ -1,22 +1,32 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
+#ifndef SLAP_SETS_H_
+#define SLAP_SETS_H_
+
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
 /* this routine needs to return the bervals instead of
  * plain strings, since syntax is not known.  It should
  * also return the syntax or some "comparison cookie"
  * that is used by set_filter.
  */
-typedef BVarray (SLAP_SET_GATHER)(
-       void *cookie, char *name, struct berval *attr);
+typedef BerVarray (SLAP_SET_GATHER)(
+       void *cookie, struct berval *name, struct berval *attr);
 
-LDAP_SLAPD_F (long) slap_set_size (BVarray set);
-LDAP_SLAPD_F (void) slap_set_dispose (BVarray set);
+LDAP_SLAPD_F (long) slap_set_size (BerVarray set);
+LDAP_SLAPD_F (void) slap_set_dispose (BerVarray set);
 
 LDAP_SLAPD_F (int)
 slap_set_filter (SLAP_SET_GATHER gatherer,
        void *cookie, struct berval *filter,
-       char *user, char *this, BVarray *results);
+       struct berval *user, struct berval *this, BerVarray *results);
+
+LDAP_END_DECL
 
+#endif