mingw32.h (OUTPUT_QUOTED_STRING): Fix macro argument expansion.

	* config/i386/mingw32.h (OUTPUT_QUOTED_STRING): Fix macro
	argument expansion.

From-SVN: r173953

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7a99c9133bf8e9800926b21630c04e8f1650d1cb..a14e54f3978aaae7609800fcc4f175b019ba899d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,9 +1,13 @@
+2011-05-20  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/i386/mingw32.h (OUTPUT_QUOTED_STRING): Fix macro
+       argument expansion.
+
 2011-05-20  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/49073
-       * gimple-fold.c (and_comparisons_1, or_comparisons_1): Return
-       NULL if PHI argument is SSA_NAME, whose def_stmt is dominated
-       by the PHI.
+       * gimple-fold.c (and_comparisons_1, or_comparisons_1): Return NULL if
+       PHI argument is SSA_NAME, whose def_stmt is dominated by the PHI.
        * tree-ssa-ifcombine.c (tree_ssa_ifcombine): Calculate dominators.
 
 2011-05-20  Richard Guenther  <rguenther@suse.de>
@@ -14,9 +18,8 @@
 
 2011-05-20  Richard Guenther  <rguenther@suse.de>
 
-       * gimple.c (gimple_register_type_1): Do not fiddle with
-       main-variant or pointer-to chains.  Delay all fixup to
-       uniquify_nodes.
+       * gimple.c (gimple_register_type_1): Do not fiddle with main-variant
+       or pointer-to chains.  Delay all fixup to uniquify_nodes.
 
 2011-05-19  Quentin Neill  <quentin.neill@amd.com>
 

diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
index 96122fca358cad913045de1dac98b620fd1af4c4..6ae7799359dc9cba6aecd629d0a93e94a70d9356 100644 (file)
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
@@ -160,11 +160,12 @@ along with GCC; see the file COPYING3.  If not see
 #undef OUTPUT_QUOTED_STRING
 #define OUTPUT_QUOTED_STRING(FILE, STRING)               \
 do {                                                    \
+  const char *_string = (const char *) (STRING);        \
   char c;                                               \
                                                         \
-  putc ('\"', asm_file);                                \
+  putc ('\"', (FILE));                                  \
                                                         \
-  while ((c = *string++) != 0)                          \
+  while ((c = *_string++) != 0)                                 \
     {                                                   \
       if (c == '\\')                                    \
        c = '/';                                         \
@@ -172,14 +173,14 @@ do {                                                       \
       if (ISPRINT (c))                                   \
         {                                                \
           if (c == '\"')                                \
-           putc ('\\', asm_file);                       \
-          putc (c, asm_file);                           \
+           putc ('\\', (FILE));                         \
+          putc (c, (FILE));                             \
         }                                                \
       else                                               \
-        fprintf (asm_file, "\\%03o", (unsigned char) c); \
+        fprintf ((FILE), "\\%03o", (unsigned char) c);  \
     }                                                   \
                                                         \
-  putc ('\"', asm_file);                                \
+  putc ('\"', (FILE));                                  \
 } while (0)
 
 /* Define as short unsigned for compatibility with MS runtime.  */