#(endif|else) foo is incorrect, make it #endif /* foo */

deraadt@ ok

15 files changed, 40 insertions, 40 deletions

diff --git a/lib/csu/i386/crt0.c b/lib/csu/i386/crt0.c
index 210c71d372a..3d17d1c3c03 100644
--- a/lib/csu/i386/crt0.c
+++ b/lib/csu/i386/crt0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crt0.c,v 1.4 2001/07/18 23:21:18 deraadt Exp $	*/
+/*	$OpenBSD: crt0.c,v 1.5 2001/08/12 12:03:01 heko Exp $	*/
 /*	$NetBSD: crt0.c,v 1.20 1995/06/03 13:16:08 pk Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2001/07/18 23:21:18 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: crt0.c,v 1.5 2001/08/12 12:03:01 heko Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -91,7 +91,7 @@ asm("eprol:");
 #ifdef MCRT0
 	atexit(_mcleanup);
 	monstartup((u_long)&eprol, (u_long)&etext);
-#endif MCRT0
+#endif /* MCRT0 */
 
 asm ("__callmain:");		/* Defined for the benefit of debuggers */
 	exit(main(kfp->kargc, argv, environ));
diff --git a/lib/csu/m68k/crt0.c b/lib/csu/m68k/crt0.c
index bff5634e3b5..dc590f76057 100644
--- a/lib/csu/m68k/crt0.c
+++ b/lib/csu/m68k/crt0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crt0.c,v 1.3 1999/08/20 14:11:35 niklas Exp $	*/
+/*	$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $	*/
 /*	$NetBSD: crt0.c,v 1.14 1995/06/03 13:16:11 pk Exp $	*/
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -33,7 +33,7 @@
 
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crt0.c,v 1.3 1999/08/20 14:11:35 niklas Exp $";
+static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -88,7 +88,7 @@ asm("eprol:");
 #ifdef MCRT0
 	atexit(_mcleanup);
 	monstartup((u_long)&eprol, (u_long)&etext);
-#endif MCRT0
+#endif /* MCRT0 */
 
 asm ("__callmain:");		/* Defined for the benefit of debuggers */
 	exit(main(kfp->kargc, argv, environ));
diff --git a/lib/csu/ns32k/crt0.c b/lib/csu/ns32k/crt0.c
index 87ec07999b8..1417a43b004 100644
--- a/lib/csu/ns32k/crt0.c
+++ b/lib/csu/ns32k/crt0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crt0.c,v 1.3 1999/08/20 14:11:36 niklas Exp $	*/
+/*	$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $	*/
 /*	$NetBSD: crt0.c,v 1.7 1995/06/03 13:16:15 pk Exp $	*/
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crt0.c,v 1.3 1999/08/20 14:11:36 niklas Exp $";
+static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ asm("eprol:");
 #ifdef MCRT0
 	atexit(_mcleanup);
 	monstartup((u_long)&eprol, (u_long)&etext);
-#endif MCRT0
+#endif /* MCRT0 */
 
 asm ("__callmain:");		/* Defined for the benefit of debuggers */
 	exit(main(kfp->kargc, argv, environ));
diff --git a/lib/csu/vax/crt0.c b/lib/csu/vax/crt0.c
index 509c4882ed8..e2ea4200ba1 100644
--- a/lib/csu/vax/crt0.c
+++ b/lib/csu/vax/crt0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crt0.c,v 1.3 1999/08/20 14:11:36 niklas Exp $	*/
+/*	$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $	*/
 /*	$NetBSD: crt0.c,v 1.1.2.1 1995/10/15 19:40:04 ragge Exp $	*/
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -33,7 +33,7 @@
 
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crt0.c,v 1.3 1999/08/20 14:11:36 niklas Exp $";
+static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -89,7 +89,7 @@ asm("eprol:");
 #ifdef MCRT0
 	atexit(_mcleanup);
 	monstartup((u_long)&eprol, (u_long)&etext);
-#endif MCRT0
+#endif /* MCRT0 */
 
 asm ("__callmain:");		/* Defined for the benefit of debuggers */
 	exit(main(kfp->kargc, argv, environ));
diff --git a/lib/libc/arch/hppa/SYS.h b/lib/libc/arch/hppa/SYS.h
index 3d1e948faab..a1fa5f561b6 100644
--- a/lib/libc/arch/hppa/SYS.h
+++ b/lib/libc/arch/hppa/SYS.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: SYS.h,v 1.7 2001/06/04 23:14:01 mickey Exp $	*/
+/*	$OpenBSD: SYS.h,v 1.8 2001/08/12 12:03:01 heko Exp $	*/
 
 /*
  * Copyright (c) 1998-1999 Michael Shalayeff
@@ -87,7 +87,7 @@ __EXIT(p,x)
 # define RSYSCALL(x)	__RSYSCALL(_thread_sys_,x)
 # define PSEUDO(x,y)	__PSEUDO(_thread_sys_,x,y)
 /*# define SYSENTRY(x)	__ENTRY(_thread_sys_,x)*/
-#else _THREAD_SAFE
+#else /* _THREAD_SAFE */
 /*
  * The non-threaded library defaults to traditional syscalls where
  * the function name matches the syscall name.
@@ -96,5 +96,5 @@ __EXIT(p,x)
 # define RSYSCALL(x)	__RSYSCALL(,x)
 # define PSEUDO(x,y)	__PSEUDO(,x,y)
 /*# define SYSENTRY(x)	__ENTRY(,x)*/
-#endif _THREAD_SAFE
+#endif /* _THREAD_SAFE */
 
diff --git a/lib/libc/arch/m68k/SYS.h b/lib/libc/arch/m68k/SYS.h
index 9cf690dc465..948eded4197 100644
--- a/lib/libc/arch/m68k/SYS.h
+++ b/lib/libc/arch/m68k/SYS.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$OpenBSD: SYS.h,v 1.4 1999/01/06 23:14:17 d Exp $
+ *	$OpenBSD: SYS.h,v 1.5 2001/08/12 12:03:01 heko Exp $
  */
 
 #include <sys/syscall.h>
@@ -85,7 +85,7 @@
 # define RSYSCALL(x)    __RSYSCALL(_thread_sys_,x)
 # define PSEUDO(x,y)    __PSEUDO(_thread_sys_,x,y)
 # define SYSENTRY(x)    __ENTRY(_thread_sys_,x)
-#else _THREAD_SAFE
+#else /* _THREAD_SAFE */
 /*
  * The non-threaded library defaults to traditional syscalls where
  * the function name matches the syscall name.
@@ -94,7 +94,7 @@
 # define RSYSCALL(x)    __RSYSCALL(,x)
 # define PSEUDO(x,y)    __PSEUDO(,x,y)
 # define SYSENTRY(x)    __ENTRY(,x)
-#endif _THREAD_SAFE
+#endif /* _THREAD_SAFE */
 
 #define	ASMSTR		.asciz
 
diff --git a/lib/libc/arch/m68k/sys/sigreturn.S b/lib/libc/arch/m68k/sys/sigreturn.S
index 44fa5e474d3..65386275ee1 100644
--- a/lib/libc/arch/m68k/sys/sigreturn.S
+++ b/lib/libc/arch/m68k/sys/sigreturn.S
@@ -37,7 +37,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sigreturn.S,v 1.3 1999/01/06 23:14:17 d Exp $"
+	.asciz "$OpenBSD: sigreturn.S,v 1.4 2001/08/12 12:03:01 heko Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
@@ -52,7 +52,7 @@
 	.globl _/**/x; .even; _/**/x:; moveml #0xC0C0,sp@-; .data; \
 	PROF/**/x:; .long 0; .text; lea PROF/**/x,a0; jbsr mcount; \
 	moveml sp@+,#0x0303
-#endif PROF
+#endif /* PROF */
 
 SYSENTRY(sigreturn)
 	trap	#1		/* signals sigreturn() */
diff --git a/lib/libc/arch/mips/SYS.h b/lib/libc/arch/mips/SYS.h
index 59d96fde4a1..f8a57c29cb8 100644
--- a/lib/libc/arch/mips/SYS.h
+++ b/lib/libc/arch/mips/SYS.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $OpenBSD: SYS.h,v 1.5 1999/01/19 01:38:54 d Exp $ 
+ *      $OpenBSD: SYS.h,v 1.6 2001/08/12 12:03:01 heko Exp $ 
  */
 
 #include <sys/syscall.h>
@@ -73,10 +73,10 @@
 # define PSEUDO(x,y)	__PSEUDO(_thread_sys_,x,y)
 # define SYSLEAF(x)	__LEAF2(_thread_sys_,x)
 # define SYSEND(x)	__END2(_thread_sys_,x)
-#else _THREAD_SAFE
+#else /* _THREAD_SAFE */
 # define RSYSCALL(x)	__RSYSCALL(,x)
 # define PSEUDO(x,y)	__PSEUDO(,x,y)
 # define SYSLEAF(x)	__LEAF2(,x)
 # define SYSEND(x)	__END2(,x)
-#endif _THREAD_SAFE
+#endif /* _THREAD_SAFE */
 
diff --git a/lib/libc/arch/ns32k/sys/sigreturn.S b/lib/libc/arch/ns32k/sys/sigreturn.S
index a78e0715b34..fec02b8cc69 100644
--- a/lib/libc/arch/ns32k/sys/sigreturn.S
+++ b/lib/libc/arch/ns32k/sys/sigreturn.S
@@ -18,7 +18,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sigreturn.S,v 1.2 1996/08/19 08:17:17 tholo Exp $"
+	.asciz "$OpenBSD: sigreturn.S,v 1.3 2001/08/12 12:03:01 heko Exp $"
 #endif /* SYSLIBC_SCCS */
 
 /*
@@ -33,7 +33,7 @@
 	.data; 1:; .long 0; \
 	.text; addr 1b(pc),r0; bsr mcount; \
 	restore [r0,r1,r2]
-#endif PROF
+#endif /* PROF */
 
 SYSCALL(sigreturn)
 	ret	0
diff --git a/lib/libc/arch/sparc/SYS.h b/lib/libc/arch/sparc/SYS.h
index 82471d1a918..3f6fe17100f 100644
--- a/lib/libc/arch/sparc/SYS.h
+++ b/lib/libc/arch/sparc/SYS.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$OpenBSD: SYS.h,v 1.7 2000/10/17 17:44:38 deraadt Exp $
+ *	$OpenBSD: SYS.h,v 1.8 2001/08/12 12:03:01 heko Exp $
  */
 
 #include <machine/asm.h>
@@ -95,7 +95,7 @@
 # define RSYSCALL(x)	__RSYSCALL(_thread_sys_,x)
 # define PSEUDO(x,y)	__PSEUDO(_thread_sys_,x,y)
 # define SYSENTRY(x)	__ENTRY(_thread_sys_,x)
-#else _THREAD_SAFE
+#else /* _THREAD_SAFE */
 /*
  * The non-threaded library defaults to traditional syscalls where
  * the function name matches the syscall name.
@@ -104,5 +104,5 @@
 # define RSYSCALL(x)	__RSYSCALL(,x)
 # define PSEUDO(x,y)	__PSEUDO(,x,y)
 # define SYSENTRY(x)	__ENTRY(,x)
-#endif _THREAD_SAFE
+#endif /* _THREAD_SAFE */
 	.globl	cerror
diff --git a/lib/libc/arch/vax/sys/sigreturn.S b/lib/libc/arch/vax/sys/sigreturn.S
index b5f6b68441c..2e19afdbf83 100644
--- a/lib/libc/arch/vax/sys/sigreturn.S
+++ b/lib/libc/arch/vax/sys/sigreturn.S
@@ -33,7 +33,7 @@
 
 #if defined(SYSLIBC_SCCS)
 	.text
-	.asciz "$OpenBSD: sigreturn.S,v 1.3 1998/05/17 10:06:37 niklas Exp $"
+	.asciz "$OpenBSD: sigreturn.S,v 1.4 2001/08/12 12:03:01 heko Exp $"
 #endif /* SYSLIBC_SCCS */
 
 #include "SYS.h"
@@ -46,7 +46,7 @@
 #define	ENTRY(x, y) \
 	.globl _ ## x; .align 2; _ ## x ## : .word 0; pushr $0x3f; \
 	.data; 1:; .long 0; .text; moval 1b,r0; jsb mcount; popr $0x3f;
-#endif PROF
+#endif /* PROF */
 
 SYSCALL(sigreturn)
 	ret
diff --git a/lib/libc/include/thread_private.h b/lib/libc/include/thread_private.h
index 6b04fd9f75c..29ff13d33c6 100644
--- a/lib/libc/include/thread_private.h
+++ b/lib/libc/include/thread_private.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: thread_private.h,v 1.6 2001/01/04 21:45:30 todd Exp $ */
+/* $OpenBSD: thread_private.h,v 1.7 2001/08/12 12:03:01 heko Exp $ */
 
 #ifndef _THREAD_PRIVATE_H_
 #define _THREAD_PRIVATE_H_
@@ -132,4 +132,4 @@ int	_thread_fd_lock_debug(int, int, struct timespec *, const char *, int);
 void	_thread_fd_unlock(int, int);
 void	_thread_fd_unlock_debug(int, int, const char *, int);
 
-#endif _THREAD_PRIVATE_H_
+#endif /* _THREAD_PRIVATE_H_ */
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
index 4cc6257acb9..41a9f0f48bb 100644
--- a/lib/libc/stdlib/abort.c
+++ b/lib/libc/stdlib/abort.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: abort.c,v 1.6 1998/11/20 11:18:49 d Exp $";
+static char *rcsid = "$OpenBSD: abort.c,v 1.7 2001/08/12 12:03:01 heko Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <signal.h>
@@ -57,9 +57,9 @@ abort()
 	sigdelset(&mask, SIGABRT);
 #ifdef _THREAD_SAFE
 	(void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
-#else  _THREAD_SAFE
+#else  /* _THREAD_SAFE */
 	(void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
-#endif _THREAD_SAFE
+#endif /* _THREAD_SAFE */
 
 	/*
 	 * POSIX requires we flush stdio buffers on abort
@@ -78,9 +78,9 @@ abort()
 	(void)signal(SIGABRT, SIG_DFL);
 #ifdef _THREAD_SAFE
 	(void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
-#else  _THREAD_SAFE
+#else  /* _THREAD_SAFE */
 	(void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
-#endif _THREAD_SAFE
+#endif /* _THREAD_SAFE */
 	(void)kill(getpid(), SIGABRT);
 	exit(1);
 }
diff --git a/lib/libc_r/TEST/test.h b/lib/libc_r/TEST/test.h
index 9713b8218f3..83c0a3f0638 100644
--- a/lib/libc_r/TEST/test.h
+++ b/lib/libc_r/TEST/test.h
@@ -119,4 +119,4 @@ __panic(type, errstr, filenm, lineno, fmt)
 #define OK		(0)
 #define NOTOK		(-1)
 
-#endif _h_test_
+#endif /* _h_test_ */
diff --git a/lib/libsectok/ifdhandler.c b/lib/libsectok/ifdhandler.c
index ca6c47dce26..bdeacecd954 100644
--- a/lib/libsectok/ifdhandler.c
+++ b/lib/libsectok/ifdhandler.c
@@ -1,4 +1,4 @@
-/* $Id: ifdhandler.c,v 1.6 2001/07/30 15:51:16 rees Exp $ */
+/* $Id: ifdhandler.c,v 1.7 2001/08/12 12:03:01 heko Exp $ */
 
 /*
 copyright 2000
@@ -162,7 +162,7 @@ IFD_Set_Capabilities(u_long Tag, u_char Value[])
 #ifdef DEBUG
 	    fprintf (stderr, "cap_table[%x].flags = %d\n",
 		     (int) Tag, cap_table[i].flags);
-#endif DEBUG
+#endif /* DEBUG */
 
 	    return 0; 
 	}