diff options
author | Elliot Lee <sopwith@src.gnome.org> | 1999-09-10 01:27:09 +0000 |
---|---|---|
committer | Elliot Lee <sopwith@src.gnome.org> | 1999-09-10 01:27:09 +0000 |
commit | 711d241ac7c8f6e289a3deb66643a74ce184f4d2 (patch) | |
tree | ebe38c8cce6c717f8f6402f5815ed7b785da4177 /support/poptconfig.c | |
parent | a7b787822872645e6f8d28f4f897c2428ba74c46 (diff) | |
download | shared-mime-info-711d241ac7c8f6e289a3deb66643a74ce184f4d2.tar.gz |
Merge from popt CVS.
Merge from popt CVS.
svn path=/trunk/; revision=913
Diffstat (limited to 'support/poptconfig.c')
-rw-r--r-- | support/poptconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support/poptconfig.c b/support/poptconfig.c index 63274ee7..2b442641 100644 --- a/support/poptconfig.c +++ b/support/poptconfig.c @@ -51,7 +51,7 @@ static void configLine(poptContext con, char * line) { shortName = opt[1]; if (!strcmp(entryType, "alias")) { - if (poptParseArgvString(line, &alias.argc, &alias.argv)) return; + if (poptParseArgvString(line, &alias.argc, (char ***)&alias.argv)) return; alias.longName = longName, alias.shortName = shortName; poptAddAlias(con, alias, 0); } else if (!strcmp(entryType, "exec")) { @@ -69,7 +69,7 @@ static void configLine(poptContext con, char * line) { } } -int poptReadConfigFile(poptContext con, char * fn) { +int poptReadConfigFile(poptContext con, const char * fn) { char * file, * chptr, * end; char * buf, * dst; int fd, rc; |