Fix merge conflicts

[bsdgames-darwin.git] / larn / nap.c

diff --git a/larn/nap.c b/larn/nap.c
index c4b3c56a89b4cf2573d2feb911dc5cc8bbcc0b62..1bd11ea676b2936b515169f315488f210c08aa0f 100644 (file)
--- a/larn/nap.c
+++ b/larn/nap.c
@@ -1,9 +1,9 @@
-/*     $NetBSD: nap.c,v 1.5 1997/10/18 20:03:36 christos Exp $ */
+/*     $NetBSD: nap.c,v 1.6 2012/06/19 05:30:43 dholland Exp $ */
 
 /* nap.c                Larn is copyrighted 1986 by Noah Morgan. */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: nap.c,v 1.5 1997/10/18 20:03:36 christos Exp $");
+__RCSID("$NetBSD: nap.c,v 1.6 2012/06/19 05:30:43 dholland Exp $");
 #endif                         /* not lint */
 
 #include <unistd.h>
@@ -14,8 +14,7 @@ __RCSID("$NetBSD: nap.c,v 1.5 1997/10/18 20:03:36 christos Exp $");
  *     routine to take a nap for n milliseconds
  */
 void
-nap(x)
-       int    x;
+nap(int x)
 {
        if (x <= 0)
                return;         /* eliminate chance for infinite loop */