ansi clean so that all gcc versions can compile these; ok drahn

4 files changed, 9 insertions, 5 deletions

diff --git a/regress/libexec/ld.so/dlopen/libaa/aa.C b/regress/libexec/ld.so/dlopen/libaa/aa.C
index b7a4686b9eb..8655a96ed14 100644
--- a/regress/libexec/ld.so/dlopen/libaa/aa.C
+++ b/regress/libexec/ld.so/dlopen/libaa/aa.C
@@ -1,10 +1,11 @@
 /*
  * Public Domain 2003 Dale Rahn
  *
- * $OpenBSD: aa.C,v 1.3 2005/09/18 19:58:49 drahn Exp $
+ * $OpenBSD: aa.C,v 1.4 2005/09/19 18:39:37 deraadt Exp $
  */
 
 #include <iostream>
+#include <string.h>
 #include "aa.h"
 char strbuf[512];
 
diff --git a/regress/libexec/ld.so/dlopen/libab/ab.C b/regress/libexec/ld.so/dlopen/libab/ab.C
index c0183fd0fc7..f9e3ef719aa 100644
--- a/regress/libexec/ld.so/dlopen/libab/ab.C
+++ b/regress/libexec/ld.so/dlopen/libab/ab.C
@@ -1,11 +1,12 @@
 /*
  * Public Domain 2003 Dale Rahn
  *
- * $OpenBSD: ab.C,v 1.3 2005/09/18 19:58:50 drahn Exp $
+ * $OpenBSD: ab.C,v 1.4 2005/09/19 18:39:37 deraadt Exp $
  */
 
 #include <iostream>
 #include <stdlib.h>
+#include <string.h>
 #include "ab.h"
 
 char strbuf[512];
diff --git a/regress/libexec/ld.so/dlopen/prog1/prog1.C b/regress/libexec/ld.so/dlopen/prog1/prog1.C
index 0ffc44a8975..6a529838f31 100644
--- a/regress/libexec/ld.so/dlopen/prog1/prog1.C
+++ b/regress/libexec/ld.so/dlopen/prog1/prog1.C
@@ -1,11 +1,12 @@
 /*
  * Public Domain 2003 Dale Rahn
  *
- * $OpenBSD: prog1.C,v 1.3 2005/09/18 19:58:50 drahn Exp $
+ * $OpenBSD: prog1.C,v 1.4 2005/09/19 18:39:38 deraadt Exp $
  */
 #include <iostream>
 #include <dlfcn.h>
 #include <string.h>
+#include <stdio.h>
 typedef char * (cp_func)(void);
 int a;
 int
diff --git a/regress/libexec/ld.so/dlsym/test2/prog2/main.c b/regress/libexec/ld.so/dlsym/test2/prog2/main.c
index 4a7f664dee7..25fd74d9247 100644
--- a/regress/libexec/ld.so/dlsym/test2/prog2/main.c
+++ b/regress/libexec/ld.so/dlsym/test2/prog2/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.2 2005/09/16 23:30:26 kurt Exp $	*/
+/*	$OpenBSD: main.c,v 1.3 2005/09/19 18:39:38 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Kurt Miller <kurt@openbsd.org>
@@ -26,13 +26,14 @@ main()
 {
 	int ret = 0;
 	void *libbb = dlopen("libbb.so", RTLD_LAZY);
+	int (*bbTest1)(void *);
 
 	if (libbb == NULL) {
 		printf("dlopen(\"libbb.so\", RTLD_LAZY) FAILED\n");
 		return (1);
 	}
 
-	int (*bbTest1)(void *) = dlsym(libbb, "bbTest1");
+	bbTest1 = dlsym(libbb, "bbTest1");
 
 	ret = (*bbTest1)(libbb);