Fix merge conflicts

[bsdgames-darwin.git] / cribbage / instr.c

diff --git a/cribbage/instr.c b/cribbage/instr.c
index 5de9b9e1007716f7d1ce461073d2ad3ea6da2d8f..5cd8f71f30193abec856beae4ee084b83bfd252f 100644 (file)
--- a/cribbage/instr.c
+++ b/cribbage/instr.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: instr.c,v 1.8 1999/09/13 17:27:36 jsm Exp $    */
+/*     $NetBSD: instr.c,v 1.14 2011/09/01 07:18:50 plunky Exp $        */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)instr.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: instr.c,v 1.8 1999/09/13 17:27:36 jsm Exp $");
+__RCSID("$NetBSD: instr.c,v 1.14 2011/09/01 07:18:50 plunky Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,7 +56,7 @@ __RCSID("$NetBSD: instr.c,v 1.8 1999/09/13 17:27:36 jsm Exp $");
 #include "pathnames.h"
 
 void
-instructions()
+instructions(void)
 {
        int pstat;
        int fd;
@@ -89,8 +85,8 @@ instructions()
                        warn("dup2");
                        _exit(1);
                }
-               execl("/bin/sh", "sh", "-c", path, NULL);
-               warn("%s", "");
+               execl("/bin/sh", "sh", "-c", path, (char *) NULL);
+               warn(NULL);
                _exit(1);
        default:
                do {