Fix merge conflicts

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

diff --git a/larn/nap.c b/larn/nap.c
index 4945299c3a4c80325d5d22aebae80e165a98b8cc..1bd11ea676b2936b515169f315488f210c08aa0f 100644 (file)
--- a/larn/nap.c
+++ b/larn/nap.c
@@ -1,18 +1,23 @@
-#ifndef lint
-static char rcsid[] = "$NetBSD: nap.c,v 1.4 1995/04/27 22:15:28 mycroft Exp $";
-#endif /* not lint */
+/*     $NetBSD: nap.c,v 1.6 2012/06/19 05:30:43 dholland Exp $ */
 
 /* nap.c                Larn is copyrighted 1986 by Noah Morgan. */
-#include <signal.h>
-#include <sys/types.h>
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: nap.c,v 1.6 2012/06/19 05:30:43 dholland Exp $");
+#endif                         /* not lint */
+
+#include <unistd.h>
+#include "header.h"
+#include "extern.h"
 
 /*
  *     routine to take a nap for n milliseconds
  */
-nap(x)
-       register int x;
-       {
-       if (x<=0) return; /* eliminate chance for infinite loop */
+void
+nap(int x)
+{
+       if (x <= 0)
+               return;         /* eliminate chance for infinite loop */
        lflush();
-       usleep(x*1000);
-       }
+       usleep(x * 1000);
+}