* cppmacro.c (make_string_token): Avoid warning.

	(cpp_macro_definition): Prepend the macro name.  Update
	comments.
	* cppmain.c (cb_define, dump_macro): Update for changes
	to cpp_macro_definition.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43528 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 4 insertions, 2 deletions

diff --git a/gcc/cppmain.c b/gcc/cppmain.c
index 0c5dc3d880f..b946a8e66ee 100644
--- a/gcc/cppmain.c
+++ b/gcc/cppmain.c
@@ -364,11 +364,13 @@ cb_define (pfile, node)
      cpp_hashnode *node;
 {
   maybe_print_line (cpp_get_line (pfile)->output_line);
-  fprintf (print.outf, "#define %s", NODE_NAME (node));
+  fputs ("#define ", print.outf);
 
   /* -dD command line option.  */
   if (options->dump_macros == dump_definitions)
     fputs ((const char *) cpp_macro_definition (pfile, node), print.outf);
+  else
+    fputs ((const char *) NODE_NAME (node), print.outf);
 
   putc ('\n', print.outf);
   print.lineno++;
@@ -446,7 +448,7 @@ dump_macro (pfile, node, v)
 {
   if (node->type == NT_MACRO && !(node->flags & NODE_BUILTIN))
     {
-      fprintf (print.outf, "#define %s", NODE_NAME (node));
+      fputs ("#define ", print.outf);
       fputs ((const char *) cpp_macro_definition (pfile, node), print.outf);
       putc ('\n', print.outf);
       print.lineno++;