diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-05-12 14:57:39 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-05-12 14:57:39 -0700 |
| commit | 1ed0274ac29e0430225c3768bcdd2124c11d9c16 (patch) | |
| tree | 3dc8aabd4af6ef3e92b7b5bdf556399452a0a139 /com32/lib | |
| parent | 8a454337874a66ed88388f79a8181645bd7e2d00 (diff) | |
| parent | fe4a9d5de55bfc168986ae44bed97b641092e88f (diff) | |
| download | syslinux-1ed0274ac29e0430225c3768bcdd2124c11d9c16.tar.gz | |
Merge branch 'master' into pathbased
Diffstat (limited to 'com32/lib')
| -rw-r--r-- | com32/lib/sys/argv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/lib/sys/argv.c b/com32/lib/sys/argv.c index 3ff869b7..db287c2b 100644 --- a/com32/lib/sys/argv.c +++ b/com32/lib/sys/argv.c @@ -78,7 +78,7 @@ int __parse_argv(char ***argv, const char *str) /* Now create argv */ arg = (char **)ALIGN_UP_FOR(q, char *); *argv = arg; - *arg++ = __com32.cs_name ? __com32.cs_name : dummy_argv0; /* argv[0] */ + *arg++ = __com32.cs_name ? (char *)__com32.cs_name : dummy_argv0; /* argv[0] */ q--; /* Point q to final null */ if (mem < q) |