Fix merge conflicts

[bsdgames-darwin.git] / sail / player.h

diff --git a/sail/player.h b/sail/player.h
index 0419adc32e5df34d1d1ebef24117b7d0661c62df..cb555a05b16e5555765a7988a66f73548aa1710c 100644 (file)
--- a/sail/player.h
+++ b/sail/player.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: player.h,v 1.11 2003/08/07 09:37:44 agc Exp $  */
+/*     $NetBSD: player.h,v 1.13 2009/08/12 09:05:08 dholland Exp $     */
 
 /*
  * Copyright (c) 1983, 1993
@@ -88,9 +88,8 @@
 extern int done_curses;
 extern int loaded, fired, changed, repaired;
 extern int dont_adjust;
-extern int viewrow, viewcol;
 extern char movebuf[sizeof SHIP(0)->file->movebuf];
-extern char version[];
+extern const char version[];
 extern int player;
 extern struct ship *ms;                /* memorial structure, &cc->ship[player] */
 extern struct File *mf;                /* ms->file */