Put dlopen() et.al. declarations in separate header file for compatibility.

gnu/usr.bin/ld/rtld/link.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: link.h,v 1.7 1995/06/04 21:57:18 pk Exp $	*/
+/*	$NetBSD: link.h,v 1.8 1995/06/05 00:08:13 pk Exp $	*/
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -172,24 +172,6 @@ struct ld_entry {
 	int	(*dlctl) __P((void *, int, void *));
 };
 
-/*
- * dlctl() commands
- */
-#define DL_GETERRNO	1
-#define DL_SETSRCHPATH	x
-#define DL_GETLIST	x
-#define DL_GETREFCNT	x
-#define DL_GETLOADADDR	x
-
-/*
- * dl*() prototypes.
- */
-extern void	*dlopen __P((char *, int));
-extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, char *));
-extern int	dlctl __P((void *, int, void *));
-
-
 /*
  * This is the structure pointed at by the __DYNAMIC symbol if an
  * executable requires the attention of the run-time link editor.

include/dlfcn.h

@@ -0,0 +1,60 @@
+/*	$NetBSD: dlfcn.h,v 1.1 1995/06/05 00:08:07 pk Exp $	*/
+
+/*
+ * Copyright (c) 1995 Paul Kranenburg
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Paul Kranenburg.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software withough specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DLFCN_H_
+#define _DLFCN_H_
+
+#include <sys/cdefs.h>
+
+/*
+ * User interface to the run-time linker.
+ */
+extern void	*dlopen __P((char *, int));
+extern int	dlclose __P((void *));
+extern void	*dlsym __P((void *, char *));
+extern int	dlctl __P((void *, int, void *));
+extern char	*dlerror __P((void));
+
+/* Values for dlopen `mode'. */
+#define DL_LAZY		1
+#define RTLD_LAZY	DL_LAZY		/* SunOS Compat */
+
+/*
+ * dlctl() commands
+ */
+#define DL_GETERRNO	1
+#define DL_SETSRCHPATH	x
+#define DL_GETLIST	x
+#define DL_GETREFCNT	x
+#define DL_GETLOADADDR	x
+
+#endif /* _DLFCN_H_ */

include/link.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: link.h,v 1.7 1995/06/04 21:57:18 pk Exp $	*/
+/*	$NetBSD: link.h,v 1.8 1995/06/05 00:08:13 pk Exp $	*/
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -172,24 +172,6 @@ struct ld_entry {
 	int	(*dlctl) __P((void *, int, void *));
 };
 
-/*
- * dlctl() commands
- */
-#define DL_GETERRNO	1
-#define DL_SETSRCHPATH	x
-#define DL_GETLIST	x
-#define DL_GETREFCNT	x
-#define DL_GETLOADADDR	x
-
-/*
- * dl*() prototypes.
- */
-extern void	*dlopen __P((char *, int));
-extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, char *));
-extern int	dlctl __P((void *, int, void *));
-
-
 /*
  * This is the structure pointed at by the __DYNAMIC symbol if an
  * executable requires the attention of the run-time link editor.

include/link_aout.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: link_aout.h,v 1.7 1995/06/04 21:57:18 pk Exp $	*/
+/*	$NetBSD: link_aout.h,v 1.8 1995/06/05 00:08:13 pk Exp $	*/
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -172,24 +172,6 @@ struct ld_entry {
 	int	(*dlctl) __P((void *, int, void *));
 };
 
-/*
- * dlctl() commands
- */
-#define DL_GETERRNO	1
-#define DL_SETSRCHPATH	x
-#define DL_GETLIST	x
-#define DL_GETREFCNT	x
-#define DL_GETLOADADDR	x
-
-/*
- * dl*() prototypes.
- */
-extern void	*dlopen __P((char *, int));
-extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, char *));
-extern int	dlctl __P((void *, int, void *));
-
-
 /*
  * This is the structure pointed at by the __DYNAMIC symbol if an
  * executable requires the attention of the run-time link editor.

libexec/ld.aout_so/link.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: link.h,v 1.7 1995/06/04 21:57:18 pk Exp $	*/
+/*	$NetBSD: link.h,v 1.8 1995/06/05 00:08:13 pk Exp $	*/
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -172,24 +172,6 @@ struct ld_entry {
 	int	(*dlctl) __P((void *, int, void *));
 };
 
-/*
- * dlctl() commands
- */
-#define DL_GETERRNO	1
-#define DL_SETSRCHPATH	x
-#define DL_GETLIST	x
-#define DL_GETREFCNT	x
-#define DL_GETLOADADDR	x
-
-/*
- * dl*() prototypes.
- */
-extern void	*dlopen __P((char *, int));
-extern int	dlclose __P((void *));
-extern void	*dlsym __P((void *, char *));
-extern int	dlctl __P((void *, int, void *));
-
-
 /*
  * This is the structure pointed at by the __DYNAMIC symbol if an
  * executable requires the attention of the run-time link editor.