This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

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


Hi,

I checked in this patch to fix indent in c-decl.c (merge_decls).


H.J.
---
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 148983)
+++ ChangeLog	(working copy)
@@ -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
Index: c-decl.c
===================================================================
--- c-decl.c	(revision 148983)
+++ c-decl.c	(working copy)
@@ -2355,13 +2355,13 @@ merge_decls (tree newdecl, tree olddecl,
 	}
     }
 
-   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.  */


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]