From fdbe100e5f134aead3920c882573eb30057e5054 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 23 Jun 2001 01:20:32 +0000
Subject: [PATCH] include <ac/string.h> as needed (not in rewrite.h)

---
 include/rewrite.h              | 8 ++------
 libraries/librewrite/config.c  | 2 ++
 libraries/librewrite/context.c | 2 ++
 libraries/librewrite/info.c    | 2 ++
 libraries/librewrite/ldapmap.c | 2 ++
 libraries/librewrite/map.c     | 1 +
 libraries/librewrite/params.c  | 2 ++
 libraries/librewrite/rewrite.c | 1 +
 libraries/librewrite/rule.c    | 2 ++
 libraries/librewrite/session.c | 2 ++
 libraries/librewrite/var.c     | 2 ++
 11 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/include/rewrite.h b/include/rewrite.h
index cacc69ae92..9c61ba942d 100644
--- 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,7 +80,8 @@ LDAP_BEGIN_DECL
  * Rewrite info
  */
 struct rewrite_info;
-struct berval;
+
+struct berval; /* avoid include */
 
 /*
  * Inits the info
@@ -223,4 +220,3 @@ rewrite_param_destroy(
 LDAP_END_DECL
 
 #endif /* REWRITE_H */
-
diff --git a/libraries/librewrite/config.c b/libraries/librewrite/config.c
index 437d475cd9..647bff7b46 100644
--- a/libraries/librewrite/config.c
+++ b/libraries/librewrite/config.c
@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 
diff --git a/libraries/librewrite/context.c b/libraries/librewrite/context.c
index e32eb8a11d..9d4f9b794e 100644
--- a/libraries/librewrite/context.c
+++ b/libraries/librewrite/context.c
@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*
diff --git a/libraries/librewrite/info.c b/libraries/librewrite/info.c
index 6a89f3ce43..e23b4a598a 100644
--- a/libraries/librewrite/info.c
+++ b/libraries/librewrite/info.c
@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*
diff --git a/libraries/librewrite/ldapmap.c b/libraries/librewrite/ldapmap.c
index 6f83ff7aa3..7eae67f957 100644
--- a/libraries/librewrite/ldapmap.c
+++ b/libraries/librewrite/ldapmap.c
@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 
diff --git a/libraries/librewrite/map.c b/libraries/librewrite/map.c
index c40456aa9c..23953bf9bc 100644
--- a/libraries/librewrite/map.c
+++ b/libraries/librewrite/map.c
@@ -24,6 +24,7 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
 #include <pwd.h>
 
 #include "rewrite-int.h"
diff --git a/libraries/librewrite/params.c b/libraries/librewrite/params.c
index 07daa0aabd..32bda7062d 100644
--- a/libraries/librewrite/params.c
+++ b/libraries/librewrite/params.c
@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*
diff --git a/libraries/librewrite/rewrite.c b/libraries/librewrite/rewrite.c
index 6753f99600..7e5b28c7f7 100644
--- a/libraries/librewrite/rewrite.c
+++ b/libraries/librewrite/rewrite.c
@@ -30,6 +30,7 @@
 #include <ac/socket.h>
 #include <ac/unistd.h>
 #include <ac/ctype.h>
+#include <ac/string.h>
 
 #include <rewrite.h>
 
diff --git a/libraries/librewrite/rule.c b/libraries/librewrite/rule.c
index 84a652daf4..1c557bf003 100644
--- a/libraries/librewrite/rule.c
+++ b/libraries/librewrite/rule.c
@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*
diff --git a/libraries/librewrite/session.c b/libraries/librewrite/session.c
index b372eff5da..0cffaeea3a 100644
--- a/libraries/librewrite/session.c
+++ b/libraries/librewrite/session.c
@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*
diff --git a/libraries/librewrite/var.c b/libraries/librewrite/var.c
index ca39ed13db..fd6bd0f703 100644
--- a/libraries/librewrite/var.c
+++ b/libraries/librewrite/var.c
@@ -24,6 +24,8 @@
 
 #include <portable.h>
 
+#include <ac/string.h>
+
 #include "rewrite-int.h"
 
 /*
-- 
2.39.5