summaryrefslogtreecommitdiff
path: root/dmake/dmake.c
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-09-25 08:39:05 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-09-25 08:39:05 +0000
commit1586db9258f0810b044a0c8ce03d8b8b28812649 (patch)
treece8d6fff57f9dcbfb8faecd237b7b6203597d6f5 /dmake/dmake.c
parent0c428f4b2d565afd9558a33f34ab200619fe3c6f (diff)
INTEGRATION: CWS dmake46 (1.7.2); FILE MERGED
2006/07/17 03:10:56 vq 1.7.2.1: #i67166# Make dmake issue a warning if a previously unset macro (i.e. it is assumed to be empty) is used and later set to a different value.
Diffstat (limited to 'dmake/dmake.c')
-rw-r--r--dmake/dmake.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/dmake/dmake.c b/dmake/dmake.c
index 212593d8a602..3ffd09f489d4 100644
--- a/dmake/dmake.c
+++ b/dmake/dmake.c
@@ -1,6 +1,6 @@
/* $RCSfile: dmake.c,v $
--- $Revision: 1.7 $
--- last change: $Author: ihi $ $Date: 2006-06-29 11:22:57 $
+-- $Revision: 1.8 $
+-- last change: $Author: vg $ $Date: 2006-09-25 09:39:05 $
--
-- SYNOPSIS
-- The main program.
@@ -278,9 +278,11 @@ char **argv;
HASHPTR hp;
/* This cleans the .SILENT setting */
hp = Def_macro(".SILENT", "", M_EXPANDED);
- /* This overrides the bitmask for further occurences, it */
- /* is set already by Create_macro_vars() and has to be */
- /* cleaned. See _set_bit_var() definition in imacs.c. */
+ /* This overrides the bitmask for further occurences of
+ * .SILENT to "no bits allowed", see bit variables in the
+ * set_macro_value() definition in dag.c.
+ * The bitmask is already set by Create_macro_vars() in
+ * imacs.c and is overridden for the V_FORCEECHO case. */
hp->MV_MASK = A_DEFAULT;
}
break;