[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    cvs commit: apache-1.3/src/modules/standard mod_userdir.c
From:       bnicholes () apache ! org
Date:       2001-11-30 17:06:24
[Download RAW message or body]

bnicholes    01/11/30 09:06:24

  Modified:    src/os/netware mod_nlm.c
               src/modules/standard mod_userdir.c
  Log:
  Fixed up some type incompatibility compiler errors so that the code will
  compile with Metrowerks 6
  
  Revision  Changes    Path
  1.5       +2 -2      apache-1.3/src/os/netware/mod_nlm.c
  
  Index: mod_nlm.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/netware/mod_nlm.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_nlm.c	2001/01/15 17:06:15	1.4
  +++ mod_nlm.c	2001/11/30 17:06:24	1.5
  @@ -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 @@
       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;
  
  
  
  1.52      +1 -1      apache-1.3/src/modules/standard/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_userdir.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- mod_userdir.c	2001/10/09 17:54:53	1.51
  +++ mod_userdir.c	2001/11/30 17:06:24	1.52
  @@ -170,7 +170,7 @@
            * 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, ':'))
  
  
  

[prev in list] [next in list] [prev in thread] [next in thread]