Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2009-10-23 12:28:03 -07:00
commit 2188dc7f55
2 changed files with 2 additions and 2 deletions

View File

@ -4026,7 +4026,7 @@ int
main(int argc, char **argv)
{
int ret;
int i;
int i = 0;
char *progname;
char *cmdname;

View File

@ -3915,7 +3915,7 @@ int
main(int argc, char **argv)
{
int ret;
int i;
int i = 0;
char *cmdname;
(void) setlocale(LC_ALL, "");