Fix all clang warnings in libc regress and cleanup some make files.

2 files changed, 10 insertions, 8 deletions

diff --git a/src/regress/lib/libc/atexit/Makefile b/src/regress/lib/libc/atexit/Makefile
index 057844d767..eb8c55e91e 100644
--- a/src/regress/lib/libc/atexit/Makefile
+++ b/src/regress/lib/libc/atexit/Makefile
@@ -1,12 +1,11 @@
-#       $OpenBSD: Makefile,v 1.6 2015/10/25 18:01:24 guenther Exp $
+#       $OpenBSD: Makefile,v 1.7 2017/07/27 15:08:37 bluhm Exp $
 
-NOMAN=
-PROG=atexit_test
-CPPFLAGS+=-I${.CURDIR}/../../../../lib/libc -D'PROTO_NORMAL(x)=__asm("")'
-CLEANFILES+= invalid.out valid.out
-LDADD=-static
+PROG =          atexit_test
+CPPFLAGS =      -I${.CURDIR}/../../../../lib/libc
+CLEANFILES =    invalid.out valid.out
+LDADD =         -static
 
-run-regress-atexit_test: ${PROG}
+run-regress-${PROG}: ${PROG}
         ./${PROG} -valid 2>${.OBJDIR}/valid.out
         cmp -s ${.OBJDIR}/valid.out ${.CURDIR}/valid.ok
         ./${PROG} -invalid-atexit 2>${.OBJDIR}/invalid.out
diff --git a/src/regress/lib/libc/atexit/atexit_test.c b/src/regress/lib/libc/atexit/atexit_test.c
index e1ea82f827..b060a9b341 100644
--- a/src/regress/lib/libc/atexit/atexit_test.c
+++ b/src/regress/lib/libc/atexit/atexit_test.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atexit_test.c,v 1.8 2015/10/25 04:11:00 guenther Exp $ */
+/*      $OpenBSD: atexit_test.c,v 1.9 2017/07/27 15:08:37 bluhm Exp $ */
 
 /*
  * Copyright (c) 2002 Daniel Hartmeier
@@ -39,6 +39,9 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
+
+#include "include/namespace.h"
+#include "hidden/stdlib.h"
 #include "stdlib/atexit.h"
 
 void    handle_first(void);