rename httpd's main() to httpd_main()

diff --git a/httpd/main.c b/httpd/main.c
index 210134e9aebb468713a00c172a004ebec72d9385..73d42fa75cf2831ed9433bb1d04b37b34bc743b6 100644 (file)
--- a/httpd/main.c
+++ b/httpd/main.c
@@ -116,8 +116,10 @@ usage(bozohttpd_t *httpd, char *progname)
        bozo_err(httpd, 1, "%s failed to start", progname);
 }
 
+int httpd_main(int, char **);
+
 int
-main(int argc, char **argv)
+httpd_main(int argc, char **argv)
 {
        bozo_httpreq_t  *request;
        bozohttpd_t      httpd;

diff --git a/tests/libstdtests/rumpkern_demo.c b/tests/libstdtests/rumpkern_demo.c
index c85557e5608de0e3e981a5d4bbe36cd06e41e1cc..69c8245c686ab40127c0fd2e37405011e8338f5d 100644 (file)
--- a/tests/libstdtests/rumpkern_demo.c
+++ b/tests/libstdtests/rumpkern_demo.c
@@ -287,7 +287,7 @@ donet(void)
        }
 }
 
-int main(int, char **);
+int http_main(int, char **);
 void *
 wwwbozo(void *arg)
 {
@@ -301,7 +301,7 @@ wwwbozo(void *arg)
         */
        optind = 1;
        optreset = 1;
-       main(sizeof(argv)/sizeof(argv[0]), argv);
+       httpd_main(sizeof(argv)/sizeof(argv[0]), argv);
 
        /* among other things, will close fd's */
        rump_pub_lwproc_releaselwp();