diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-26 19:05:22 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-26 19:05:22 +0000 |
| commit | da870daca9dd502e59cb7ef45c0792702da0a44a (patch) | |
| tree | 25dbe8c2f990e92b896ad58e9deb8f647009aadc | |
| parent | d4079d70d903874515f5872b322b80e789eb969e (diff) | |
| download | ppe42-gcc-da870daca9dd502e59cb7ef45c0792702da0a44a.tar.gz ppe42-gcc-da870daca9dd502e59cb7ef45c0792702da0a44a.zip | |
2009-06-26 H.J. Lu <hongjiu.lu@intel.com>
* c-decl.c (merge_decls): Re-indent.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148984 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-decl.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 34db7459a2b..86e7d6e7ff1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2009-06-26 H.J. Lu <hongjiu.lu@intel.com> + + * c-decl.c (merge_decls): Re-indent. + 2009-06-26 Janis Johnson <janis187@us.ibm.com> PR c/39902 diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 5eab454e03d..9f852fff77a 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -2355,13 +2355,13 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype) } } - extern_changed = DECL_EXTERNAL (olddecl) && !DECL_EXTERNAL (newdecl); + extern_changed = DECL_EXTERNAL (olddecl) && !DECL_EXTERNAL (newdecl); - /* Merge the USED information. */ - if (TREE_USED (olddecl)) - TREE_USED (newdecl) = 1; - else if (TREE_USED (newdecl)) - TREE_USED (olddecl) = 1; + /* Merge the USED information. */ + if (TREE_USED (olddecl)) + TREE_USED (newdecl) = 1; + else if (TREE_USED (newdecl)) + TREE_USED (olddecl) = 1; /* Copy most of the decl-specific fields of NEWDECL into OLDDECL. But preserve OLDDECL's DECL_UID and DECL_CONTEXT. */ |
