GCC doesn't replace functional macros if there's no trailing perins;

PCC does

SCCS-vsn: games/monop/monop.c 5.5
SCCS-vsn: games/monop/monop.h 5.3

diff --git a/usr/src/games/monop/monop.c b/usr/src/games/monop/monop.c
index 1196624..81e2066 100644 (file)
--- a/usr/src/games/monop/monop.c
+++ b/usr/src/games/monop/monop.c
@@ -17,7 +17,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)monop.c    5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)monop.c    5.5 (Berkeley) %G%";

 #endif /* not lint */
 
 # include      "monop.def"
 #endif /* not lint */
 
 # include      "monop.def"


@@ -136,6 +136,6 @@ init_monops() {
        for (mp = mon; mp < &mon[N_MON]; mp++) {
                mp->name = mp->not_m;
                for (i = 0; i < mp->num_in; i++)
        for (mp = mon; mp < &mon[N_MON]; mp++) {
                mp->name = mp->not_m;
                for (i = 0; i < mp->num_in; i++)

-                       mp->sq[i] = &board[mp->sqnum[i]];
+                       mp->sq[i] = &board[mp->sqnums[i]];

        }
 }
        }
 }

diff --git a/usr/src/games/monop/monop.h b/usr/src/games/monop/monop.h
index 9713138..79375c6 100644 (file)
--- a/usr/src/games/monop/monop.h
+++ b/usr/src/games/monop/monop.h
@@ -9,7 +9,7 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *

- *     @(#)monop.h     5.2 (Berkeley) %G%
+ *     @(#)monop.h     5.3 (Berkeley) %G%

  */
 
 # include      <stdio.h>
  */
 
 # include      <stdio.h>


@@ -63,7 +63,7 @@ struct sqr_st {                       /* structure for square                 */
 
 typedef struct sqr_st  SQUARE;
 
 
 typedef struct sqr_st  SQUARE;
 

-struct mon_st {                        /* monopoly descriptin structure        */
+struct mon_st {                        /* monopoly description structure       */

        char    *name;                  /* monop. name (color)          */
        shrt    owner;                  /* owner of monopoly            */
        shrt    num_in;                 /* # in monopoly                */
        char    *name;                  /* monop. name (color)          */
        shrt    owner;                  /* owner of monopoly            */
        shrt    num_in;                 /* # in monopoly                */


@@ -71,7 +71,7 @@ struct mon_st {                       /* monopoly descriptin structure        */
        shrt    h_cost;                 /* price of houses              */
        char    *not_m;                 /* name if not monopoly         */
        char    *mon_n;                 /* name if a monopoly           */
        shrt    h_cost;                 /* price of houses              */
        char    *not_m;                 /* name if not monopoly         */
        char    *mon_n;                 /* name if a monopoly           */

-       char    sqnum[3];               /* Square numbers (used to init)*/
+       char    sqnums[3];              /* Square numbers (used to init)*/

        SQUARE  *sq[3];                 /* list of squares in monop     */
 };
 
        SQUARE  *sq[3];                 /* list of squares in monop     */
 };