[src/trunk]: src/games/tetris Declare variables as extern in headers rather t...

[jsm <jsm%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/42c108644cc1
branches:  trunk
changeset: 480068:42c108644cc1
user:      jsm <jsm%NetBSD.org@localhost>
date:      Sat Jan 01 10:15:17 2000 +0000

description:
Declare variables as extern in headers rather than using linker commons.

diffstat:

 games/tetris/screen.h |   6 +++---
 games/tetris/tetris.c |  15 ++++++++++++++-
 games/tetris/tetris.h |  18 +++++++++---------
 3 files changed, 26 insertions(+), 13 deletions(-)

diffs (113 lines):

diff -r 9ebad0e9f1aa -r 42c108644cc1 games/tetris/screen.h
--- a/games/tetris/screen.h     Sat Jan 01 05:00:03 2000 +0000
+++ b/games/tetris/screen.h     Sat Jan 01 10:15:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: screen.h,v 1.4 1999/10/04 23:27:03 lukem Exp $ */
+/*     $NetBSD: screen.h,v 1.5 2000/01/01 10:15:17 jsm Exp $   */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -41,8 +41,8 @@
 /*
  * Capabilities from TERMCAP (used in the score code).
  */
-char *SEstr;                   /* end standout mode */
-char *SOstr;                   /* begin standout mode */
+extern char *SEstr;            /* end standout mode */
+extern char *SOstr;            /* begin standout mode */
 
 /*
  * putpad() is for padded strings with count=1.
diff -r 9ebad0e9f1aa -r 42c108644cc1 games/tetris/tetris.c
--- a/games/tetris/tetris.c     Sat Jan 01 05:00:03 2000 +0000
+++ b/games/tetris/tetris.c     Sat Jan 01 10:15:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tetris.c,v 1.12 1999/09/12 09:02:24 jsm Exp $  */
+/*     $NetBSD: tetris.c,v 1.13 2000/01/01 10:15:17 jsm Exp $  */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -62,8 +62,21 @@
 #include "screen.h"
 #include "tetris.h"
 
+cell   board[B_SIZE];          /* 1 => occupied, 0 => empty */
+
+int    Rows, Cols;             /* current screen size */
+
+const struct shape *curshape;
+const struct shape *nextshape;
+
+long   fallrate;               /* less than 1 million; smaller => faster */
+
+int    score;                  /* the obvious thing */
 gid_t  gid, egid;
 
+char   key_msg[100];
+int    showpreview;
+
 static void    elide __P((void));
 static void    setup_board __P((void));
        int     main __P((int, char **));
diff -r 9ebad0e9f1aa -r 42c108644cc1 games/tetris/tetris.h
--- a/games/tetris/tetris.h     Sat Jan 01 05:00:03 2000 +0000
+++ b/games/tetris/tetris.h     Sat Jan 01 10:15:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tetris.h,v 1.7 1999/09/12 09:02:24 jsm Exp $   */
+/*     $NetBSD: tetris.h,v 1.8 2000/01/01 10:15:17 jsm Exp $   */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -60,7 +60,7 @@
 #define        B_SIZE  (B_ROWS * B_COLS)
 
 typedef unsigned char cell;
-cell   board[B_SIZE];          /* 1 => occupied, 0 => empty */
+extern cell    board[B_SIZE];  /* 1 => occupied, 0 => empty */
 
        /* the displayed area (rows) */
 #define        D_FIRST 1
@@ -76,7 +76,7 @@
 #define        MINROWS 23
 #define        MINCOLS 40
 
-int    Rows, Cols;             /* current screen size */
+extern int     Rows, Cols;     /* current screen size */
 
 /*
  * Translations from board coordinates to display coordinates.
@@ -134,8 +134,8 @@
 extern const struct shape shapes[];
 #define        randshape() (&shapes[random() % 7])
 
-const struct shape *curshape;
-const struct shape *nextshape;
+extern const struct shape *curshape;
+extern const struct shape *nextshape;
 
 /*
  * Shapes fall at a rate faster than once per second.
@@ -147,7 +147,7 @@
  * The value eventually reaches a limit, and things stop going faster,
  * but by then the game is utterly impossible.
  */
-long   fallrate;               /* less than 1 million; smaller => faster */
+extern long    fallrate;       /* less than 1 million; smaller => faster */
 #define        faster() (fallrate -= fallrate / 3000)
 
 /*
@@ -167,11 +167,11 @@
  * we find that it is at rest and integrate it---until then, it can
  * still be moved or rotated).
  */
-int    score;                  /* the obvious thing */
+extern int     score;          /* the obvious thing */
 extern gid_t   gid, egid;
 
-char   key_msg[100];
-int    showpreview;
+extern char    key_msg[100];
+extern int     showpreview;
 
 int    fits_in __P((const struct shape *, int));
 void   place __P((const struct shape *, int, int));