diff options
author | Uros Bizjak <uros@gcc.gnu.org> | 2011-05-20 16:49:56 +0200 |
---|---|---|
committer | Uros Bizjak <uros@gcc.gnu.org> | 2011-05-20 16:49:56 +0200 |
commit | 3cda91d8634805fcb1148cb856a6fc7605f6719f (patch) | |
tree | 2c350602435774dbda1707e115d92f8ba471887e /gcc | |
parent | 9272cac88ae7d97a98c1abe073b017513b064fc0 (diff) | |
download | gcc-3cda91d8634805fcb1148cb856a6fc7605f6719f.zip gcc-3cda91d8634805fcb1148cb856a6fc7605f6719f.tar.gz gcc-3cda91d8634805fcb1148cb856a6fc7605f6719f.tar.bz2 |
mingw32.h (OUTPUT_QUOTED_STRING): Fix macro argument expansion.
* config/i386/mingw32.h (OUTPUT_QUOTED_STRING): Fix macro
argument expansion.
From-SVN: r173953
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 15 | ||||
-rw-r--r-- | gcc/config/i386/mingw32.h | 13 |
2 files changed, 16 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7a99c91..a14e54f 100644 --- 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 96122fc..6ae7799 100644 --- 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. */ |