diff options
| -rw-r--r-- | usr.bin/lex/flexdef.h | 14 | ||||
| -rw-r--r-- | usr.bin/lex/main.c | 26 |
2 files changed, 2 insertions, 38 deletions
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h index 7a0ef646522..650f2526197 100644 --- a/usr.bin/lex/flexdef.h +++ b/usr.bin/lex/flexdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: flexdef.h,v 1.9 2015/11/19 19:43:40 tedu Exp $ */ +/* $OpenBSD: flexdef.h,v 1.10 2015/11/19 22:58:59 tedu Exp $ */ /* flexdef - definitions file for flex */ @@ -125,18 +125,6 @@ char *alloca (); #endif #endif -#ifdef VMS -#ifndef __VMS_POSIX -#define unlink remove -#define SHORT_FILE_NAMES -#endif -#endif - -#ifdef MS_DOS -#define SHORT_FILE_NAMES -#endif - - /* Maximum line length we'll have to deal with. */ #define MAXLINE 2048 diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c index 1fcb8ed8a9c..3e3845a4396 100644 --- a/usr.bin/lex/main.c +++ b/usr.bin/lex/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.18 2015/11/19 22:52:40 tedu Exp $ */ +/* $OpenBSD: main.c,v 1.19 2015/11/19 22:58:59 tedu Exp $ */ /* flex - tool to generate fast lexical analyzers */ @@ -116,19 +116,9 @@ struct yytbl_writer tableswr; */ char *program_name = "flex"; -#ifndef SHORT_FILE_NAMES static const char *outfile_template = "lex.%s.%s"; static const char *backing_name = "lex.backup"; static const char *tablesfile_template = "lex.%s.tables"; -#else -static const char *outfile_template = "lex%s.%s"; -static const char *backing_name = "lex.bck"; -static const char *tablesfile_template = "lex%s.tbl"; -#endif - -#ifdef MS_DOS -extern unsigned _stklen = 16384; -#endif /* From scan.l */ extern FILE *yyout; @@ -1591,23 +1581,9 @@ readin() /* In reentrant scanner, stdinit is handled in flex.skl. */ if (do_stdinit) { if (reentrant) { - outn("#ifdef VMS"); - outn("#ifdef __VMS_POSIX"); outn("#define YY_STDINIT"); - outn("#endif"); - outn("#else"); - outn("#define YY_STDINIT"); - outn("#endif"); } - outn("#ifdef VMS"); - outn("#ifndef __VMS_POSIX"); - outn(yy_nostdinit); - outn("#else"); - outn(yy_stdinit); - outn("#endif"); - outn("#else"); outn(yy_stdinit); - outn("#endif"); } else { if (!reentrant) outn(yy_nostdinit); |