Fix some externs

diff --git a/libraries/librewrite/config.c b/libraries/librewrite/config.c
index 437d475cd9a14fe0b77103c50149128fa91d4f3e..3e10ac200c8526022236154917b520088ab8545e 100644 (file)
--- a/libraries/librewrite/config.c
+++ b/libraries/librewrite/config.c
@@ -27,11 +27,6 @@
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 
-/*
- * Global data
- */
-extern struct rewrite_context *__curr_context;
-
 /*
  * Parses a plugin map
  */

diff --git a/libraries/librewrite/parse.c b/libraries/librewrite/parse.c
index bf4426cebf3e329b54f393dddede7849c21e6b24..7b65d1897f7866666b3817547257d67b4b426e8e 100644 (file)
--- a/libraries/librewrite/parse.c
+++ b/libraries/librewrite/parse.c
@@ -90,7 +90,7 @@ parse_line(
 }
 
 int
-read_rewrite( 
+rewrite_read( 
                FILE *fin,
                struct rewrite_info *info
 )

diff --git a/libraries/librewrite/rewrite-int.h b/libraries/librewrite/rewrite-int.h
index 56c11fd638eebdc28b6afdd9c7afac0c47493ed7..1886227f4cb4efddd8b0133447d48fc45183f2f3 100644 (file)
--- a/libraries/librewrite/rewrite-int.h
+++ b/libraries/librewrite/rewrite-int.h
@@ -313,6 +313,7 @@ struct rewrite_info {
  * PRIVATE *
  ***********/
 
+LDAP_V (struct rewrite_context*) __curr_context;
 
 /*
  * Maps

diff --git a/libraries/librewrite/rewrite.c b/libraries/librewrite/rewrite.c
index 56eb66bfd648ca08369561c8af4dcefabc80e5e2..586b50c91016265f5e2984f19036639cd78dbd0d 100644 (file)
--- a/libraries/librewrite/rewrite.c
+++ b/libraries/librewrite/rewrite.c
@@ -39,12 +39,6 @@ int ldap_debug;
 int ldap_syslog;
 int ldap_syslog_level;
 
-extern int
-read_rewrite(
-               FILE *fin,
-               struct rewrite_info *info
-);
-
 char *
 apply( 
                FILE *fin, 
@@ -59,7 +53,7 @@ apply(
 
        info = rewrite_info_init(REWRITE_MODE_ERR);
 
-       if ( read_rewrite( fin, info ) != 0 ) {
+       if ( rewrite_read( fin, info ) != 0 ) {
                exit( EXIT_FAILURE );
        }