commit f20d59e69137336a2555844ce9f74ece96ad60ea
author Jean-Baptiste Queru <jbq@google.com> Fri Jan 20 17:23:52 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 20 17:23:52 2012 -0800
tree b2327c6280733482bb036a8a5c47256bba47eb8e
parent c3650d6a4be812989bcc6b4938af6da644168a09
parent c83c1da54831ef1c9ff59cf9df8d5c0173893ee5

am c83c1da5: am cee8425f: Merge "Move variable declaration on its own line"

* commit 'c83c1da54831ef1c9ff59cf9df8d5c0173893ee5':
  Move variable declaration on its own line

linker/linker.c

diff --git a/linker/linker.c b/linker/linker.c
index 2b3a7c0..d31b46d 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -2135,7 +2135,8 @@
 
     int argc = (int) *elfdata;
     char **argv = (char**) (elfdata + 1);
-    unsigned *vecs = (unsigned*) (argv + argc + 1), *v;
+    unsigned *vecs = (unsigned*) (argv + argc + 1);
+    unsigned *v;
     soinfo *si;
     struct link_map * map;
     const char *ldpath_env = NULL;