From 711d241ac7c8f6e289a3deb66643a74ce184f4d2 Mon Sep 17 00:00:00 2001
From: Elliot Lee <sopwith@src.gnome.org>
Date: Fri, 10 Sep 1999 01:27:09 +0000
Subject: Merge from popt CVS.

Merge from popt CVS.

svn path=/trunk/; revision=913
---
 support/poptconfig.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'support/poptconfig.c')

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;
-- 
cgit v1.2.1