2012-03-23 William Bader <williambader@hotmail.com>

	c-family/
	* c-lex.c (c_lex_with_flags): Avoid declarations after stmts.

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

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 350ee14..6c4ac8b 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-23  William Bader  <williambader@hotmail.com>
+
+       * c-lex.c (c_lex_with_flags): Avoid declarations after stmts.
+
 2012-03-20  Jason Merrill  <jason@redhat.com>
 
        * c-common.h (enum cxx_dialect): Add cxx1y.

diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index 7b220ab..7e2029c 100644 (file)
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -342,6 +342,8 @@ c_lex_with_flags (tree *value, location_t *loc, unsigned char *cpp_flags,
 
        if (flags & CPP_N_USERDEF)
          {
+           char *str;
+           tree literal;
            tree suffix_id = get_identifier (suffix);
            int len = tok->val.str.len - strlen (suffix);
            /* If this is going to be used as a C string to pass to a
@@ -350,9 +352,9 @@ c_lex_with_flags (tree *value, location_t *loc, unsigned char *cpp_flags,
                                            (const char *) tok->val.str.text);
            TREE_TYPE (num_string) = char_array_type_node;
            num_string = fix_string_type (num_string);
-           char *str = CONST_CAST (char *, TREE_STRING_POINTER (num_string));
+           str = CONST_CAST (char *, TREE_STRING_POINTER (num_string));
            str[len] = '\0';
-           tree literal = build_userdef_literal (suffix_id, *value,
+           literal = build_userdef_literal (suffix_id, *value,
                                                  num_string);
            *value = literal;
          }