]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fixed up some type incompatibility compiler errors so that the code will
authorBradley Nicholes <bnicholes@apache.org>
Fri, 30 Nov 2001 17:06:24 +0000 (17:06 +0000)
committerBradley Nicholes <bnicholes@apache.org>
Fri, 30 Nov 2001 17:06:24 +0000 (17:06 +0000)
compile with Metrowerks 6

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@92262 13f79535-47bb-0310-9956-ffa450edef68

src/modules/standard/mod_userdir.c
src/os/netware/mod_nlm.c

index 29b3df945ce428b1cad12cdf9f00403738bc4cfc..8c7c3a5a6e3d57d126bc0997b956b8dd003b33d4 100644 (file)
@@ -170,7 +170,7 @@ static const char *set_user_dir(cmd_parms *cmd, void *dummy, char *arg)
          * config 'word' for validity and copy the entire arg to the userdir 
          * if all paths are valid.
          */
-        char *userdirs = arg;
+        const char *userdirs = arg;
         while (*userdirs) {
             char *thisdir = ap_getword_conf(cmd->pool, &userdirs);
             if (!ap_os_is_path_absolute(thisdir) && !strchr(thisdir, ':'))
index c110d29313a4edc1079103622de4e77156dc24d4..2d97c39adb3239fca692320966b7e5666ee8f6b4 100644 (file)
@@ -63,7 +63,7 @@
 module MODULE_VAR_EXPORT nlm_module;
 static int been_there_done_that = 0; /* Loaded the modules yet? */
 
-char *load_module(cmd_parms *cmd, void *dummy, char *modname, char *filename)
+static const char *load_module(cmd_parms *cmd, void *dummy, char *modname, char *filename)
 {
     module *modp;
     int nlmHandle;
@@ -102,7 +102,7 @@ char *load_module(cmd_parms *cmd, void *dummy, char *modname, char *filename)
     return NULL;
 }
 
-char *load_file(cmd_parms *cmd, void *dummy, char *filename)
+static const char *load_file(cmd_parms *cmd, void *dummy, char *filename)
 {
     if (been_there_done_that)
         return NULL;