httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/include http_config.h
Date Thu, 22 Feb 2001 08:15:50 GMT
dougm       01/02/22 00:15:50

  Modified:    server   config.c
               include  http_config.h
  Log:
  avoid c++ keywords
  
  Revision  Changes    Path
  1.115     +2 -2      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- config.c	2001/02/18 04:26:12	1.114
  +++ config.c	2001/02/22 08:15:48	1.115
  @@ -191,11 +191,11 @@
   
   ap_conf_vector_t *ap_merge_per_dir_configs(apr_pool_t *p,
                                              ap_conf_vector_t *base,
  -                                           ap_conf_vector_t *new)
  +                                           ap_conf_vector_t *new_conf)
   {
       void **conf_vector = apr_palloc(p, sizeof(void *) * total_modules);
       void **base_vector = (void **) base;
  -    void **new_vector = (void **) new;
  +    void **new_vector = (void **) new_conf;
       module *modp;
   
       for (modp = top_module; modp; modp = modp->next) {
  
  
  
  1.67      +2 -2      httpd-2.0/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- http_config.h	2001/02/18 04:26:12	1.66
  +++ http_config.h	2001/02/22 08:15:49	1.67
  @@ -845,11 +845,11 @@
    * Run all of the modules merge per dir config functions
    * @param p The pool to pass to the merge functions
    * @param base The base directory config structure
  - * @param new The new directory config structure
  + * @param new_conf The new directory config structure
    */
   ap_conf_vector_t *ap_merge_per_dir_configs(apr_pool_t *p,
                                              ap_conf_vector_t *base,
  -                                           ap_conf_vector_t *new);
  +                                           ap_conf_vector_t *new_conf);
   
   /* For http_connection.c... */
   /**
  
  
  

Mime
View raw message