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

* commit 'c83c1da54831ef1c9ff59cf9df8d5c0173893ee5':
  Move variable declaration on its own line
This commit is contained in:
Jean-Baptiste Queru 2012-01-20 17:23:52 -08:00 committed by Android Git Automerger
commit f20d59e691

View File

@ -2135,7 +2135,8 @@ static unsigned __linker_init_post_relocation(unsigned **elfdata)
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;