diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-08-27 22:52:26 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-27 22:52:27 -0700 |
| commit | 38714f1ac0f7591e9d6fa23386c2450bb64e7213 (patch) | |
| tree | 65962d0f8006e3e6cab8dc76f84537647f65ead8 /gcc-4.6 | |
| parent | 21bf998c3d45f38bdacff8a99e7691977927ed6f (diff) | |
| parent | b61c3a578b95325f25e08f41c6dfa199b3b53e0b (diff) | |
| download | toolchain_gcc-38714f1ac0f7591e9d6fa23386c2450bb64e7213.tar.gz toolchain_gcc-38714f1ac0f7591e9d6fa23386c2450bb64e7213.tar.bz2 toolchain_gcc-38714f1ac0f7591e9d6fa23386c2450bb64e7213.zip | |
Merge "Fix compilation with GCC 4.7"
Diffstat (limited to 'gcc-4.6')
| -rw-r--r-- | gcc-4.6/gcc/gengtype.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc-4.6/gcc/gengtype.c b/gcc-4.6/gcc/gengtype.c index abf17f8e7..6c0ca4a0b 100644 --- a/gcc-4.6/gcc/gengtype.c +++ b/gcc-4.6/gcc/gengtype.c @@ -3594,14 +3594,13 @@ write_field_root (outf_p f, pair_p v, type_p type, const char *name, int has_length, struct fileloc *line, const char *if_marked, bool emit_pch, type_p field_type, const char *field_name) { + struct pair newv; /* If the field reference is relative to V, rather than to some subcomponent of V, we can mark any subarrays with a single stride. We're effectively treating the field as a global variable in its own right. */ if (v && type == v->type) { - struct pair newv; - newv = *v; newv.type = field_type; newv.name = ACONCAT ((v->name, ".", field_name, NULL)); |