You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2001/12/11 20:36:06 UTC

cvs commit: httpd-2.0/server config.c

bnicholes    01/12/11 11:36:06

  Modified:    server/mpm/netware mpm_netware.c
               server   config.c
  Log:
  Clean up GNU compiler issues on NetWare
  Submitted by: Pavel Novy
  
  Revision  Changes    Path
  1.15      +1 -1      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mpm_netware.c	2001/11/19 16:10:36	1.14
  +++ mpm_netware.c	2001/12/11 19:36:05	1.15
  @@ -122,7 +122,7 @@
   #include <signal.h>
   
   #include <netware.h>
  -#include <nks\netware.h>
  +#include <nks/netware.h>
   #include <library.h>
   
   #define WORKER_DEAD         SERVER_DEAD
  
  
  
  1.140     +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.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- config.c	2001/11/24 00:08:30	1.139
  +++ config.c	2001/12/11 19:36:05	1.140
  @@ -97,13 +97,13 @@
   
   AP_DECLARE_DATA const char *ap_server_argv0;
   
  -AP_DECLARE_DATA const char *ap_server_root;
  +AP_DECLARE_DATA const char *ap_server_root = NULL;
   
   AP_DECLARE_DATA apr_array_header_t *ap_server_pre_read_config;
   AP_DECLARE_DATA apr_array_header_t *ap_server_post_read_config;
   AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines;
   
  -AP_DECLARE_DATA ap_directive_t *ap_conftree;
  +AP_DECLARE_DATA ap_directive_t *ap_conftree = NULL;
   
   APR_HOOK_STRUCT(
              APR_HOOK_LINK(header_parser)