include <ac/string.h> as needed (not in rewrite.h)

diff --git a/include/rewrite.h b/include/rewrite.h
index cacc69ae9229ef9625a341e4f6f10a80288812f6..9c61ba942d35e6ad3a101a64b364f2fc7ec6520f 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,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 437d475cd9a14fe0b77103c50149128fa91d4f3e..647bff7b468e2c082db3141c889f5c0a7bc513ad 100644 (file)
--- 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 e32eb8a11d147390b925a3a482d8491583cc6e45..9d4f9b794ea2d629a961b4adaed8fb2713295038 100644 (file)
--- 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 6a89f3ce43adef9a660aaf0e1a60ea7946b377b5..e23b4a598a0212152b63dc61cb504774f492d351 100644 (file)
--- 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 6f83ff7aa35d91844ba3907a4bb512b526a6a934..7eae67f957ae15a921c59b27263f956583ffe51b 100644 (file)
--- 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 c40456aa9cc6d5a366c078428fce44392b79d74a..23953bf9bc5b2f75f67b5d5464d47a91cfd95baa 100644 (file)
--- 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 07daa0aabd8950d912ea16e0ab9c8b103d2ddbd8..32bda7062dd7b5bc5fde2f2c9c0c6ce533e8f680 100644 (file)
--- 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 6753f996003d08df551eb18f002edd7c1fbebd2f..7e5b28c7f7aee8e785780e4f75be6118ec5bd0ec 100644 (file)
--- 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 84a652daf416634f86360b1fb075566b773a1c26..1c557bf0036b07d8d7d2e299b8cf1515b540920d 100644 (file)
--- 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 b372eff5da9d0a7d452ace02e114d85f9a4b4732..0cffaeea3af9c3a5ca7838b84aa5111c97a6fdb7 100644 (file)
--- 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 ca39ed13db2556205b8ec2bcda9810bb0ef71cff..fd6bd0f703e4cf4bdfe84eba4dd552c53ef4f060 100644 (file)
--- 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"
 
 /*