added hasSubordinates to back-monitor

[openldap] / include / rewrite.h

diff --git a/include/rewrite.h b/include/rewrite.h
index cacc69ae9229ef9625a341e4f6f10a80288812f6..1c74f073e4afd31178a127f8a5f35f07c24a3b5f 100644 (file)
--- a/include/rewrite.h
+++ b/include/rewrite.h
@@ -25,10 +25,6 @@
 #ifndef REWRITE_H
 #define REWRITE_H
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 LDAP_BEGIN_DECL
 
 /*
@@ -84,12 +80,13 @@ LDAP_BEGIN_DECL
  * Rewrite info
  */
 struct rewrite_info;
-struct berval;
+
+struct berval; /* avoid include */
 
 /*
  * Inits the info
  */
-extern struct rewrite_info *
+LDAP_REWRITE_F (struct rewrite_info *)
 rewrite_info_init(
                int mode
 );
@@ -97,7 +94,7 @@ rewrite_info_init(
 /*
  * Cleans up the info structure
  */
-extern int
+LDAP_REWRITE_F (int)
 rewrite_info_delete(
                 struct rewrite_info *info
 );
@@ -114,7 +111,7 @@ rewrite_info_delete(
  *      rewriteMap             mapType mapName [mapArgs]
  *      rewriteParam           paramName paramValue
  */
-extern int
+LDAP_REWRITE_F (int)
 rewrite_parse(
                struct rewrite_info *info,
                 const char *fname,
@@ -138,7 +135,7 @@ rewrite_parse(
  *      - ok with copy of string as result,
  *      - use the default rewrite context.
  */
-extern int
+LDAP_REWRITE_F (int)
 rewrite(
                struct rewrite_info *info,
                const char *rewriteContext,
@@ -149,7 +146,7 @@ rewrite(
 /*
  * Same as above; the cookie relates the rewrite to a session
  */
-extern int
+LDAP_REWRITE_F (int)
 rewrite_session(
                struct rewrite_info *info,
                const char *rewriteContext,
@@ -161,7 +158,7 @@ rewrite_session(
 /*
  * Inits a session
  */
-extern struct rewrite_session *
+LDAP_REWRITE_F (struct rewrite_session *)
 rewrite_session_init(
                 struct rewrite_info *info,
                 const void *cookie
@@ -170,7 +167,7 @@ rewrite_session_init(
 /*
  * Defines and inits a variable with session scope
  */
-extern int
+LDAP_REWRITE_F (int)
 rewrite_session_var_set(
                struct rewrite_info *info,
                const void *cookie,
@@ -181,7 +178,7 @@ rewrite_session_var_set(
 /*
  * Deletes a session
  */
-extern int
+LDAP_REWRITE_F (int)
 rewrite_session_delete(
                struct rewrite_info *info,
                const void *cookie
@@ -195,7 +192,7 @@ rewrite_session_delete(
 /*
  * Defines and inits a variable with global scope
  */
-extern int
+LDAP_REWRITE_F (int)
 rewrite_param_set(
                 struct rewrite_info *info,
                 const char *name,
@@ -205,7 +202,7 @@ rewrite_param_set(
 /*
  * Gets a var with global scope
  */
-extern int
+LDAP_REWRITE_F (int)
 rewrite_param_get(
                 struct rewrite_info *info,
                 const char *name,
@@ -215,7 +212,7 @@ rewrite_param_get(
 /* 
  * Destroys the parameter tree
  */
-extern int
+LDAP_REWRITE_F (int)
 rewrite_param_destroy(
                 struct rewrite_info *info
 );
@@ -223,4 +220,3 @@ rewrite_param_destroy(
 LDAP_END_DECL
 
 #endif /* REWRITE_H */
-