Merge branch 'ls/travis-enable-httpd-tests'

diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index 509aeef400e6495ce7ca428d7df5cd63f3aa1247..3c6d08cd095152cab9abeb038c1b4f82440c55cd 100644 (file)
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -66,7 +66,7 @@ static int iterate_cb(const char *var, const char *value, void *data)
        return 0;
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
        int i, val;
        const char *v;