Fix merge conflicts

[bsdgames-darwin.git] / robots / query.c

diff --git a/robots/query.c b/robots/query.c
index fecf608c35bdf375138108c0c38eaffc081057d6..85b603d3e1d48590c6eb5bee8e4349c533226394 100644 (file)
--- a/robots/query.c
+++ b/robots/query.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: query.c,v 1.9 2009/07/20 06:39:06 dholland Exp $       */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,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.
  *
@@ -31,21 +29,27 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)query.c    5.4 (Berkeley) 6/1/90";
+#if 0
+static char sccsid[] = "@(#)query.c    8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: query.c,v 1.9 2009/07/20 06:39:06 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "robots.h"
+#include <curses.h>
+#include "robots.h"
 
 /*
  * query:
  *     Ask a question and get a yes or no answer.  Default is "no".
  */
-query(prompt)
-char   *prompt;
+int
+query(const char *prompt)
 {
-       register int    c, retval;
-       register int    y, x;
+       int c, retval;
+       int y, x;
 
        getyx(stdscr, y, x);
        move(Y_PROMPT, X_PROMPT);