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

* commit 'cee8425f22cfe268614c7bb47b2f5874ac6a0e4b':
  Move variable declaration on its own line
This commit is contained in:
Jean-Baptiste Queru 2012-01-20 11:54:49 -08:00 committed by Android Git Automerger
commit c83c1da548

View File

@ -2085,7 +2085,8 @@ unsigned __linker_init(unsigned **elfdata)
int argc = (int) *elfdata; int argc = (int) *elfdata;
char **argv = (char**) (elfdata + 1); char **argv = (char**) (elfdata + 1);
unsigned *vecs = (unsigned*) (argv + argc + 1), *v; unsigned *vecs = (unsigned*) (argv + argc + 1);
unsigned *v;
soinfo *si; soinfo *si;
struct link_map * map; struct link_map * map;
const char *ldpath_env = NULL; const char *ldpath_env = NULL;