Commit fbbc17c7 by Mike Stump

Fix whitespacing

From-SVN: r114143
parent e8300d6e
...@@ -1699,9 +1699,9 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype) ...@@ -1699,9 +1699,9 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
DECL_IN_SYSTEM_HEADER (olddecl) = 1; DECL_IN_SYSTEM_HEADER (olddecl) = 1;
/* Merge the section attribute. /* Merge the section attribute.
We want to issue an error if the sections conflict but that must be We want to issue an error if the sections conflict but that
done later in decl_attributes since we are called before attributes must be done later in decl_attributes since we are called
are assigned. */ before attributes are assigned. */
if (DECL_SECTION_NAME (newdecl) == NULL_TREE) if (DECL_SECTION_NAME (newdecl) == NULL_TREE)
DECL_SECTION_NAME (newdecl) = DECL_SECTION_NAME (olddecl); DECL_SECTION_NAME (newdecl) = DECL_SECTION_NAME (olddecl);
...@@ -1769,8 +1769,8 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype) ...@@ -1769,8 +1769,8 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
{ {
/* If we're redefining a function previously defined as extern /* If we're redefining a function previously defined as extern
inline, make sure we emit debug info for the inline before we inline, make sure we emit debug info for the inline before we
throw it away, in case it was inlined into a function that hasn't throw it away, in case it was inlined into a function that
been written out yet. */ hasn't been written out yet. */
if (new_is_definition && DECL_INITIAL (olddecl)) if (new_is_definition && DECL_INITIAL (olddecl))
{ {
if (TREE_USED (olddecl) if (TREE_USED (olddecl)
...@@ -1786,8 +1786,8 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype) ...@@ -1786,8 +1786,8 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
} }
else else
{ {
/* If either decl says `inline', this fn is inline, /* If either decl says `inline', this fn is inline, unless
unless its definition was passed already. */ its definition was passed already. */
if (DECL_DECLARED_INLINE_P (newdecl) if (DECL_DECLARED_INLINE_P (newdecl)
|| DECL_DECLARED_INLINE_P (olddecl)) || DECL_DECLARED_INLINE_P (olddecl))
DECL_DECLARED_INLINE_P (newdecl) = 1; DECL_DECLARED_INLINE_P (newdecl) = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment