Merge branch 'tg/maint-zsh-svn-remote-prompt'

diff --git a/test-parse-options.c b/test-parse-options.c
index 3c9510a70107eed584916d61707002390d7d246a..434e8b892981e3b052437d1c7eb2668a70cf2dfa 100644 (file)
--- a/test-parse-options.c
+++ b/test-parse-options.c
@@ -29,7 +29,7 @@ static int number_callback(const struct option *opt, const char *arg, int unset)
        return 0;
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
        const char *prefix = "prefix/";
        const char *usage[] = {
@@ -81,7 +81,7 @@ int main(int argc, const char **argv)
        };
        int i;
 
-       argc = parse_options(argc, argv, prefix, options, usage, 0);
+       argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
 
        printf("boolean: %d\n", boolean);
        printf("integer: %u\n", integer);