summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2008-08-16 12:25:22 +0000
committerMarc Espie <espie@cvs.openbsd.org>2008-08-16 12:25:22 +0000
commitb2ee669e3c74223f34b02167b6eaed3a4d849503 (patch)
tree1850f12e7566e076f0d03bd8c43c4dedaf761a9a
parentb43dd542b25e792ba072a64e8c996e4fc4913d66 (diff)
revert eval.c
-rw-r--r--usr.bin/m4/eval.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index e67a71c6392..258d3aae273 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eval.c,v 1.64 2008/08/16 12:21:46 espie Exp $ */
+/* $OpenBSD: eval.c,v 1.65 2008/08/16 12:25:21 espie Exp $ */
/* $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $ */
/*
@@ -139,7 +139,7 @@ expand_builtin(const char *argv[], int argc, int td)
*/
ac = argc;
- if (argc == 3 && !*(argv[2]) && !mimic_gnu)
+ if (argc == 3 && !*(argv[2]))
argc--;
switch (td & TYPEMASK) {
@@ -576,10 +576,9 @@ expand_macro(const char *argv[], int argc)
void
dodefine(const char *name, const char *defn)
{
- if (!*name && !mimic_gnu)
+ if (!*name)
m4errx(1, "null definition.");
- else
- macro_define(name, defn);
+ macro_define(name, defn);
}
/*
@@ -613,10 +612,9 @@ dodefn(const char *name)
static void
dopushdef(const char *name, const char *defn)
{
- if (!*name && !mimic_gnu)
+ if (!*name)
m4errx(1, "null definition.");
- else
- macro_pushdef(name, defn);
+ macro_pushdef(name, defn);
}
/*