diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-11-03 16:21:48 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-11-03 16:21:48 +0000 |
| commit | 76e19c592bb7d5aa09e318bcc5dc3be972a2caf8 (patch) | |
| tree | b5e94ae45c6c829340ca444e47eff5f901e6f7cf | |
| parent | f87799d0a8e27da9390ccd0444efb0466c88753f (diff) | |
There really is no double standard. Treat m4 just like openssl, by
removing VMS and MSDOS support.
ok espie
| -rw-r--r-- | usr.bin/m4/main.c | 8 | ||||
| -rw-r--r-- | usr.bin/m4/mdef.h | 6 | ||||
| -rw-r--r-- | usr.bin/m4/pathnames.h | 20 |
3 files changed, 3 insertions, 31 deletions
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c index 5336268f681..58e21676fa4 100644 --- a/usr.bin/m4/main.c +++ b/usr.bin/m4/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.85 2015/11/01 18:17:59 espie Exp $ */ +/* $OpenBSD: main.c,v 1.86 2015/11/03 16:21:47 deraadt Exp $ */ /* $NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $ */ /*- @@ -131,13 +131,7 @@ struct keyblk keywrds[] = { /* m4 keywords to be installed */ { "traceon", TRACEONTYPE | NOARGS }, { "traceoff", TRACEOFFTYPE | NOARGS }, -#if defined(unix) || defined(__unix__) { "unix", SELFTYPE | NOARGS }, -#else -#ifdef vms - { "vms", SELFTYPE | NOARGS }, -#endif -#endif }; #define MAXKEYS (sizeof(keywrds)/sizeof(struct keyblk)) diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h index 3185dcb38fa..f0d9d39c45f 100644 --- a/usr.bin/m4/mdef.h +++ b/usr.bin/m4/mdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mdef.h,v 1.32 2014/12/21 09:33:12 espie Exp $ */ +/* $OpenBSD: mdef.h,v 1.33 2015/11/03 16:21:47 deraadt Exp $ */ /* $NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $ */ /* @@ -106,10 +106,6 @@ #define SCOMMT '#' #define ECOMMT '\n' -#ifdef msdos -#define system(str) (-1) -#endif - /* * other important constants */ diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h index 69fa6c26333..85ed2589008 100644 --- a/usr.bin/m4/pathnames.h +++ b/usr.bin/m4/pathnames.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pathnames.h,v 1.5 2003/06/03 02:56:10 millert Exp $ */ +/* $OpenBSD: pathnames.h,v 1.6 2015/11/03 16:21:47 deraadt Exp $ */ /* $NetBSD: pathnames.h,v 1.6 1995/09/29 00:27:55 cgd Exp $ */ /* @@ -35,22 +35,4 @@ * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 */ -/* - * Definitions of diversion files. If the name of the file is changed, - * adjust UNIQUE to point to the wildcard (*) character in the filename. - */ - -#ifdef msdos -#define _PATH_DIVNAME "\\M4*XXXXXX" /* msdos diversion files */ -#define UNIQUE 3 /* unique char location */ -#endif - -#if defined(unix) || defined(__NetBSD__) || defined(__OpenBSD__) #define _PATH_DIVNAME "/tmp/m4.0XXXXXXXXXX" /* unix diversion files */ -#define UNIQUE 8 /* unique char location */ -#endif - -#ifdef vms -#define _PATH_DIVNAME "sys$login:m4*XXXXXX" /* vms diversion files */ -#define UNIQUE 12 /* unique char location */ -#endif |