Remove ifdefs for V7 (as opposed to older) unix.

This commit is contained in:
dholland 2012-10-13 19:25:22 +00:00
parent 4105daf3e6
commit bc604cfe52
3 changed files with 6 additions and 14 deletions

View File

@ -1,9 +1,9 @@
# $NetBSD: Makefile.inc,v 1.7 2010/02/03 15:34:38 roy Exp $ # $NetBSD: Makefile.inc,v 1.8 2012/10/13 19:25:22 dholland Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
LIBCOMMON != cd ${.CURDIR}/../common_source; ${PRINTOBJDIR} LIBCOMMON != cd ${.CURDIR}/../common_source; ${PRINTOBJDIR}
CPPFLAGS+=-DV7 -I${.CURDIR}/../common_source CPPFLAGS+=-I${.CURDIR}/../common_source
DPADD+= ${LIBCOMMON}/libcommon.a ${LIBTERMINFO} DPADD+= ${LIBCOMMON}/libcommon.a ${LIBTERMINFO}
LDADD+= -L${LIBCOMMON} -lcommon -lterminfo LDADD+= -L${LIBCOMMON} -lcommon -lterminfo

View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.30 2012/10/13 19:19:38 dholland Exp $ */ /* $NetBSD: main.c,v 1.31 2012/10/13 19:25:22 dholland Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
#if 0 #if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else #else
__RCSID("$NetBSD: main.c,v 1.30 2012/10/13 19:19:38 dholland Exp $"); __RCSID("$NetBSD: main.c,v 1.31 2012/10/13 19:25:22 dholland Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -121,11 +121,7 @@ main(int argc __unused, char **argv)
/* need this now beceause getarg() may try to load a game */ /* need this now beceause getarg() may try to load a game */
mm = &mmstore; mm = &mmstore;
move_init(mm); move_init(mm);
#ifdef V7
while (*++argv != 0) /* process arguments */ while (*++argv != 0) /* process arguments */
#else
while (*++argv != -1) /* process arguments */
#endif
getarg(mm, &argv); getarg(mm, &argv);
args[acnt] = '\0'; args[acnt] = '\0';
if (tflag) { /* clear screen */ if (tflag) { /* clear screen */

View File

@ -1,4 +1,4 @@
/* $NetBSD: teach.c,v 1.22 2012/10/13 19:19:39 dholland Exp $ */ /* $NetBSD: teach.c,v 1.23 2012/10/13 19:25:22 dholland Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
#if 0 #if 0
static char sccsid[] = "@(#)teach.c 8.1 (Berkeley) 5/31/93"; static char sccsid[] = "@(#)teach.c 8.1 (Berkeley) 5/31/93";
#else #else
__RCSID("$NetBSD: teach.c,v 1.22 2012/10/13 19:19:39 dholland Exp $"); __RCSID("$NetBSD: teach.c,v 1.23 2012/10/13 19:25:22 dholland Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -81,11 +81,7 @@ main(int argc __unused, char *argv[])
/* need this now beceause getarg() may try to load a game */ /* need this now beceause getarg() may try to load a game */
mm = &mmstore; mm = &mmstore;
move_init(mm); move_init(mm);
#ifdef V7
while (*++argv != 0) while (*++argv != 0)
#else
while (*++argv != -1)
#endif
getarg(mm, &argv); getarg(mm, &argv);
if (tflag) { if (tflag) {
noech.c_oflag &= ~(ONLCR | OXTABS); noech.c_oflag &= ~(ONLCR | OXTABS);