c-decl.c (merge_decls): Re-indent.

2009-06-26  H.J. Lu  <hongjiu.lu@intel.com>

	* c-decl.c (merge_decls): Re-indent.

From-SVN: r148984

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 34db745..86e7d6e 100644 (file)
--- 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 5eab454..9f852ff 100644 (file)
--- 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.  */