Fix merge conflicts

[bsdgames-darwin.git] / tetris / screen.h

diff --git a/tetris/screen.h b/tetris/screen.h
index 940fc60ed61180aa6d200fb4c8cd2346590cfdc3..c0b39053158db7f01137d6fb5f9bc1ae7214a069 100644 (file)
--- a/tetris/screen.h
+++ b/tetris/screen.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: screen.h,v 1.7 2003/08/07 09:37:48 agc Exp $   */
+/*     $NetBSD: screen.h,v 1.9 2009/08/12 08:51:21 dholland Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -45,11 +45,10 @@ extern char *SOstr;         /* begin standout mode */
  */
 #define        putpad(s)       tputs(s, 1, put)
 
-void    moveto(int, int);
-int    put __P((int));         /* just calls putchar; for tputs */
-void   scr_clear __P((void));
-void   scr_end __P((void));
-void   scr_init __P((void));
-void   scr_msg __P((char *, int));
-void   scr_set __P((void));
-void   scr_update __P((void));
+int    put(int);               /* just calls putchar; for tputs */
+void   scr_clear(void);
+void   scr_end(void);
+void   scr_init(void);
+void   scr_msg(char *, int);
+void   scr_set(void);
+void   scr_update(void);