From: Howard Chu <hyc@openldap.org>
Date: Wed, 2 Jan 2002 23:31:44 +0000 (+0000)
Subject: Fix some externs
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~337
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9b73b8a568c2705822a3af627e5c54b82d5ed1ca;p=openldap

Fix some externs
---

diff --git a/libraries/librewrite/config.c b/libraries/librewrite/config.c
index 437d475cd9..3e10ac200c 100644
--- 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 bf4426cebf..7b65d1897f 100644
--- 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 56c11fd638..1886227f4c 100644
--- 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 56eb66bfd6..586b50c910 100644
--- 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 );
 	}