From 0e9cb8bed8a6e08ced8af6616ef54d6fb7ec5208 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@FreeBSD.org>
Date: Mon, 7 Oct 1996 20:49:03 +0000
Subject: [PATCH] dlfcn.h and link.h have conflicting declarations for
 dlopen/dlsym, with dlfcn.h declaring them as:

void *dlopen __P((const char *, int));
void *dlsym __P((void *, const char *));

while link.h declared them as

extern void *dlopen __P((char *, int));
extern void *dlsym __P((void *, char *));

Fix link.h to match dlfcn.h
---
 include/link.h      | 6 +++---
 sys/sys/link_aout.h | 6 +++---
 sys/sys/link_elf.h  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/link.h b/include/link.h
index 7d35e028b06b..022563027ab8 100644
--- a/include/link.h
+++ b/include/link.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: link.h,v 1.6 1996/01/30 23:30:20 mpp Exp $
+ *	$Id: link.h,v 1.7 1996/10/01 00:25:32 peter Exp $
  */
 
 /*
@@ -184,9 +184,9 @@ struct ld_entry {
 /*
  * dl*() prototypes.
  */
-extern void	*dlopen __P((char *, int));
+extern void	*dlopen __P((const char *, int));
 extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, char *));
+extern void	*dlsym __P((void *, const char *));
 extern char	*dlerror __P((void));
 
 
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
index 7d35e028b06b..022563027ab8 100644
--- a/sys/sys/link_aout.h
+++ b/sys/sys/link_aout.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: link.h,v 1.6 1996/01/30 23:30:20 mpp Exp $
+ *	$Id: link.h,v 1.7 1996/10/01 00:25:32 peter Exp $
  */
 
 /*
@@ -184,9 +184,9 @@ struct ld_entry {
 /*
  * dl*() prototypes.
  */
-extern void	*dlopen __P((char *, int));
+extern void	*dlopen __P((const char *, int));
 extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, char *));
+extern void	*dlsym __P((void *, const char *));
 extern char	*dlerror __P((void));
 
 
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index 7d35e028b06b..022563027ab8 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: link.h,v 1.6 1996/01/30 23:30:20 mpp Exp $
+ *	$Id: link.h,v 1.7 1996/10/01 00:25:32 peter Exp $
  */
 
 /*
@@ -184,9 +184,9 @@ struct ld_entry {
 /*
  * dl*() prototypes.
  */
-extern void	*dlopen __P((char *, int));
+extern void	*dlopen __P((const char *, int));
 extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, char *));
+extern void	*dlsym __P((void *, const char *));
 extern char	*dlerror __P((void));