summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>1999-09-14 08:30:21 +0000
committerMarc Espie <espie@cvs.openbsd.org>1999-09-14 08:30:21 +0000
commit2a0990bd11f0c886db6c6c0b079f6d47c7fe67c1 (patch)
tree939f64e964ab04790edf76f06cfd01b410460844
parentf8dd25afa5d8e26631cf9b73b406cbf0bce5c7e7 (diff)
-I works better when activated...
Fuss with prototypes.
-rw-r--r--usr.bin/m4/expr.c5
-rw-r--r--usr.bin/m4/main.c10
2 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 304d403dc16..4f4b624c9dd 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expr.c,v 1.5 1999/09/14 08:26:10 espie Exp $ */
+/* $OpenBSD: expr.c,v 1.6 1999/09/14 08:30:20 espie Exp $ */
/* $NetBSD: expr.c,v 1.7 1995/09/28 05:37:31 tls Exp $ */
/*
@@ -41,12 +41,13 @@
#if 0
static char sccsid[] = "@(#)expr.c 8.2 (Berkeley) 4/29/95";
#else
-static char rcsid[] = "$OpenBSD: expr.c,v 1.5 1999/09/14 08:26:10 espie Exp $";
+static char rcsid[] = "$OpenBSD: expr.c,v 1.6 1999/09/14 08:30:20 espie Exp $";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
#include <stdio.h>
+#include <ctype.h>
#include "mdef.h"
/*
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index d613c29d818..857d814a640 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.15 1999/09/14 08:21:37 espie Exp $ */
+/* $OpenBSD: main.c,v 1.16 1999/09/14 08:30:20 espie Exp $ */
/* $NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $ */
/*-
@@ -47,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.15 1999/09/14 08:21:37 espie Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.16 1999/09/14 08:30:20 espie Exp $";
#endif
#endif /* not lint */
@@ -140,7 +140,6 @@ extern char *optarg;
void macro();
void initkwds();
-extern int getopt();
int
main(argc,argv)
@@ -158,7 +157,7 @@ main(argc,argv)
initkwds();
initspaces();
- while ((c = getopt(argc, argv, "tD:U:o:")) != -1)
+ while ((c = getopt(argc, argv, "tD:U:o:I:")) != -1)
switch(c) {
case 'D': /* define something..*/
@@ -169,6 +168,9 @@ main(argc,argv)
*p++ = EOS;
dodefine(optarg, p);
break;
+ case 'I':
+ addtoincludepath(optarg);
+ break;
case 'U': /* undefine... */
remhash(optarg, TOP);
break;