Fix IRIX sc_mask conflict

[openldap] / servers / slapd / back-bdb / external.h

diff --git a/servers/slapd/back-bdb/external.h b/servers/slapd/back-bdb/external.h
index 44b2dc87535d7afd9f251a6eb2137acc1507248d..f7c285a808621fd2c84810ded9b298ca033c3f8d 100644 (file)
--- a/servers/slapd/back-bdb/external.h
+++ b/servers/slapd/back-bdb/external.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -9,100 +9,39 @@
 
 LDAP_BEGIN_DECL
 
-extern int     bdb_back_initialize LDAP_P(( BackendInfo *bi ));
-extern int     bdb_back_open LDAP_P(( BackendInfo *bi ));
-extern int     bdb_back_close LDAP_P(( BackendInfo *bi ));
-extern int     bdb_back_destroy LDAP_P(( BackendInfo *bi ));
-
-extern int     bdb_back_db_init LDAP_P(( BackendDB *bd ));
-extern int     bdb_back_db_open LDAP_P(( BackendDB *bd ));
-extern int     bdb_back_db_close LDAP_P(( BackendDB *bd ));
-extern int     bdb_back_db_destroy LDAP_P(( BackendDB *bd ));
-
-extern int     bdb_back_db_config LDAP_P(( BackendDB *bd,
-       const char *fname, int lineno,
-       int argc, char **argv ));
-
-extern int bdb_back_extended LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op,
-       const char *reqoid,
-       struct berval *reqdata,
-       char **rspoid,
-       struct berval **rspdata,
-       LDAPControl *** rspctrls,
-       const char **text,
-       struct berval *** refs ));
-
-extern int bdb_back_bind LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op,
-       const char *dn, const char *ndn, int method,
-       struct berval *cred, char** edn ));
-
-extern int     bdb_back_unbind LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op ));
-
-extern int     bdb_back_search LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op,
-       const char *base, const char *nbase,
-       int scope, int deref, int sizelimit, int timelimit,
-       Filter *filter, const char *filterstr,
-       char **attrs, int attrsonly ));
-
-extern int     bdb_back_compare LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op,
-       const char *dn, const char *ndn,
-       AttributeAssertion *ava ));
-
-extern int     bdb_back_modify LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op,
-       const char *dn, const char *ndn, Modifications *ml ));
-
-extern int     bdb_back_modrdn LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op,
-       const char *dn, const char *ndn,
-       const char* newrdn, int deleteoldrdn,
-       const char *newSuperior ));
-
-extern int     bdb_back_add LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op, Entry *e ));
-
-extern int     bdb_back_delete LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op,
-       const char *dn, const char *ndn ));
-
-extern int     bdb_back_abandon LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op, ber_int_t msgid ));
-
-extern int     bdb_back_group LDAP_P(( BackendDB *bd,
-       Entry *target,
-       const char* gr_ndn,
-       const char* op_ndn,
-       ObjectClass* group_oc,
-       AttributeDescription* group_at));
-
-extern int     bdb_back_attribute LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op,
-       Entry *target,
-       const char* e_ndn,
-       AttributeDescription* entry_at,
-       struct berval ***vals));
-
-
-/* hooks for slap tools */
-extern int bdb_tool_entry_open LDAP_P(( BackendDB *be, int mode ));
-extern int bdb_tool_entry_close LDAP_P(( BackendDB *be ));
-extern ID bdb_tool_entry_first LDAP_P(( BackendDB *be ));
-extern ID bdb_tool_entry_next LDAP_P(( BackendDB *be ));
-extern Entry* bdb_tool_entry_get LDAP_P(( BackendDB *be, ID id ));
-extern ID bdb_tool_entry_put LDAP_P(( BackendDB *be, Entry *e ));
-
-extern int bdb_tool_entry_reindex LDAP_P(( BackendDB *be, ID id ));
-extern int bdb_tool_sync LDAP_P(( BackendDB *be ));
-
-extern int bdb_back_referrals LDAP_P(( BackendDB *bd,
-       Connection *conn, Operation *op,
-       const char *dn, const char *ndn,
-       const char **text ));
+extern BI_init bdb_initialize;
+
+extern BI_db_config    bdb_db_config;
+
+extern BI_op_add       bdb_add;
+
+extern BI_op_bind      bdb_bind;
+
+extern BI_op_compare   bdb_compare;
+
+extern BI_op_delete    bdb_delete;
+
+extern BI_op_modify    bdb_modify;
+
+extern BI_op_modrdn    bdb_modrdn;
+
+extern BI_op_search    bdb_search;
+
+extern BI_op_extended  bdb_extended;
+
+extern BI_chk_referrals        bdb_referrals;
+
+extern BI_operational  bdb_operational;
+
+/* tools.c */
+extern BI_tool_entry_open      bdb_tool_entry_open;
+extern BI_tool_entry_close     bdb_tool_entry_close;
+extern BI_tool_entry_next      bdb_tool_entry_next;
+extern BI_tool_entry_get       bdb_tool_entry_get;
+extern BI_tool_entry_put       bdb_tool_entry_put;
+extern BI_tool_entry_reindex   bdb_tool_entry_reindex;
+
+
 
 LDAP_END_DECL