Update.

2000-12-17  Andreas Jaeger  <aj@suse.de>

	* elf/vismain.c: Move prototypes for functions in vismod*.c to
	vismod.h.
	* elf/vismod.h: New file.
	* elf/Makefile (distribute): Add vismod.h.
	* elf/vismod1.c: Include vismod.h.
	* elf/vismod2.c: Likewise.
	* elf/vismod3.c: Likewise.

	* elf/constload3.c: Add prototype declarations to shut up gcc.
	* elf/failobj.c: Likewise.
	* elf/nodelmod3.c: Likewise.
	* elf/filtmod1.c: Likewise.
	* elf/filtmod2.c: Likewise.
	* elf/reldepmod1.c: Likewise.
	* elf/reldepmod2.c: Likewise.
	* elf/reldepmod3.c: Likewise.
	* elf/reldepmod4.c: Likewise.
	* elf/unload2dep.c: Likewise.
	* elf/unload2mod.c: Likewise.
	* elf/ltglobmod1.c: Likewise.
	* elf/pathoptobj.c: Likewise.

	* locale/programs/ld-collate.c (collate_finish): Don't use labels
	at end of compound statement.
	* locale/programs/locale.c (show_info): Likewise.
	* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr_r): Likewise.

6 files changed, 35 insertions, 26 deletions

diff --git a/elf/Makefile b/elf/Makefile
index 830499366f..6359f22270 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -56,7 +56,7 @@ distribute	:= $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
 		   nextmod1.c nextmod2.c pathoptobj.c tst-pathopt.sh \
 		   neededobj1.c neededobj2.c neededobj3.c neededobj4.c \
 		   unload2mod.c unload2dep.c ltglobmod1.c ltglobmod2.c \
-		   testobj.h
+		   testobj.h vismod.h
 
 include ../Makeconfig
 
diff --git a/elf/vismain.c b/elf/vismain.c
index a9769202c3..b49b62dccb 100644
--- a/elf/vismain.c
+++ b/elf/vismain.c
@@ -20,6 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "vismod.h"
+
 /* Prototype for our test function.  */
 extern int do_test (void);
 
@@ -28,31 +30,6 @@ extern int do_test (void);
 /* This defines the `main' function and some more.  */
 #include <test-skeleton.c>
 
-/* Prototypes for the functions in the DSOs.  */
-extern int calllocal1 (void);
-extern int (*getlocal1 (void)) (void);
-extern int callinmod1 (void);
-extern int (*getinmod1 (void)) (void);
-extern int callitcpt1 (void);
-extern int (*getitcpt1 (void)) (void);
-extern const char *getvarlocal1 (void);
-extern const char *getvarinmod1 (void);
-extern const char *getvaritcpt1 (void);
-extern int calllocal2 (void);
-extern int (*getlocal2 (void)) (void);
-extern int callinmod2 (void);
-extern int (*getinmod2 (void)) (void);
-extern int callitcpt2 (void);
-extern int (*getitcpt2 (void)) (void);
-extern const char *getvarlocal2 (void);
-extern const char *getvarinmod2 (void);
-extern const char *getvaritcpt2 (void);
-extern int callitcpt3 (void);
-extern int (*getitcpt3 (void)) (void);
-extern const char *getvaritcpt3 (void);
-
-extern int protinmod (void);
-extern int protitcpt (void);
 
 /* Prototypes for local functions.  */
 extern int protlocal (void);
diff --git a/elf/vismod.h b/elf/vismod.h
new file mode 100644
index 0000000000..505d381919
--- /dev/null
+++ b/elf/vismod.h
@@ -0,0 +1,27 @@
+/* Prototypes for the functions in the DSOs.  */
+extern int calllocal1 (void);
+extern int (*getlocal1 (void)) (void);
+extern int callinmod1 (void);
+extern int (*getinmod1 (void)) (void);
+extern int callitcpt1 (void);
+extern int (*getitcpt1 (void)) (void);
+extern const char *getvarlocal1 (void);
+extern const char *getvarinmod1 (void);
+extern const char *getvaritcpt1 (void);
+extern int calllocal2 (void);
+extern int (*getlocal2 (void)) (void);
+extern int callinmod2 (void);
+extern int (*getinmod2 (void)) (void);
+extern int callitcpt2 (void);
+extern int (*getitcpt2 (void)) (void);
+extern const char *getvarlocal2 (void);
+extern const char *getvarinmod2 (void);
+extern const char *getvaritcpt2 (void);
+extern int callitcpt3 (void);
+extern int (*getitcpt3 (void)) (void);
+extern const char *getvaritcpt3 (void);
+
+extern int protinmod (void);
+extern int protitcpt (void);
+extern int protlocal (void);
+
diff --git a/elf/vismod1.c b/elf/vismod1.c
index de80cf3600..bca2f308e8 100644
--- a/elf/vismod1.c
+++ b/elf/vismod1.c
@@ -16,6 +16,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include "vismod.h"
+
 int
 protlocal (void)
 {
diff --git a/elf/vismod2.c b/elf/vismod2.c
index 35ce4d2564..38c4da32cb 100644
--- a/elf/vismod2.c
+++ b/elf/vismod2.c
@@ -17,6 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stdlib.h>
+#include "vismod.h"
 
 int
 protlocal (void)
diff --git a/elf/vismod3.c b/elf/vismod3.c
index 2549d3771c..7b4ec031d3 100644
--- a/elf/vismod3.c
+++ b/elf/vismod3.c
@@ -16,6 +16,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include "vismod.h"
+
 int
 protitcpt (void)
 {