aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/m4
diff options
context:
space:
mode:
authorJuli Mallett <jmallett@FreeBSD.org>2002-05-02 05:25:23 +0000
committerJuli Mallett <jmallett@FreeBSD.org>2002-05-02 05:25:23 +0000
commit8f12fc049cc86e0cc55ab7a0a6b935a3c49672b1 (patch)
tree50878f5c729007c44be0cbc76e026fa5bd3ba656 /usr.bin/m4
parenteee11f05b466aa6924477079b4d4c95ef715df55 (diff)
downloadsrc-8f12fc049cc86e0cc55ab7a0a6b935a3c49672b1.tar.gz
src-8f12fc049cc86e0cc55ab7a0a6b935a3c49672b1.zip
Remove redundant declarations of getopt(3) externals (since <unistd.h> does
take care of them), and add __FreeBSD__ to the defined() checks for the _PATH_DIVNAME.
Notes
Notes: svn path=/head/; revision=95918
Diffstat (limited to 'usr.bin/m4')
-rw-r--r--usr.bin/m4/main.c3
-rw-r--r--usr.bin/m4/pathnames.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index b97b21ac705f..ca01cb07d9e0 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -146,9 +146,6 @@ struct keyblk keywrds[] = { /* m4 keywords to be installed */
#define MAXKEYS (sizeof(keywrds)/sizeof(struct keyblk))
-extern int optind;
-extern char *optarg;
-
#define MAXRECORD 50
static struct position {
char *name;
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index 043190c4fa07..94e8164f07ab 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -50,7 +50,8 @@
#define UNIQUE 3 /* unique char location */
#endif
-#if defined(unix) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(unix) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+ defined(__OpenBSD__)
#define _PATH_DIVNAME "/tmp/m4.0XXXXXXXXXX" /* unix diversion files */
#define UNIQUE 8 /* unique char location */
#endif