httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-1.3/src/test test_find.c test_parser.c
Date Thu, 22 Jun 2000 23:23:29 GMT
wrowe       00/06/22 16:23:27

  Modified:    src      ApacheCore.dsp ApacheCore.mak Makefile.tmpl
               src/ap   Makefile.tmpl ap.mak
               src/include ap_mmn.h httpd.h
               src/main Makefile.tmpl alloc.c gen_test_char.mak
               src/modules/example Makefile.tmpl
               src/modules/experimental Makefile.tmpl
               src/modules/proxy ApacheModuleProxy.mak Makefile.tmpl
               src/modules/standard Makefile.tmpl
               src/modules/test Makefile.tmpl
               src/os/bs2000 Makefile.tmpl
               src/os/os2 Makefile.tmpl
               src/os/os390 Makefile.tmpl
               src/os/tpf os.c
               src/os/win32 ApacheModuleAuthAnon.mak
                        ApacheModuleAuthDigest.mak ApacheModuleCERNMeta.mak
                        ApacheModuleDigest.mak ApacheModuleExpires.mak
                        ApacheModuleHeaders.mak ApacheModuleInfo.mak
                        ApacheModuleRewrite.mak ApacheModuleSpeling.mak
                        ApacheModuleStatus.mak ApacheModuleUserTrack.mak
                        Module.mak.tmpl
               src/os/win32/installer/installdll install.mak
               src/support htdigest.mak htpasswd.mak
               src/test test_find.c test_parser.c
  Log:
    Rename the alloc.h header file to ap_alloc.h.  This patch will be
    followed by the physical copy of alloc.h to ap_alloc.h in order to
    preserve all historical comments, and cvs deletion of alloc.h.
    A minor MMN bump is included in this patch.
  
    Resolves problems observed by Borland and a few other compilers that
    can't discern which alloc.h they should be including, the os's or the
    Apache file.
  
  Revision  Changes    Path
  1.33      +1 -1      apache-1.3/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ApacheCore.dsp,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- ApacheCore.dsp	2000/06/08 14:18:33	1.32
  +++ ApacheCore.dsp	2000/06/22 23:22:16	1.33
  @@ -264,7 +264,7 @@
   # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
   # Begin Source File
   
  -SOURCE=.\include\alloc.h
  +SOURCE=.\include\ap_alloc.h
   # End Source File
   # Begin Source File
   
  
  
  
  1.44      +73 -73    apache-1.3/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ApacheCore.mak,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- ApacheCore.mak	2000/05/10 20:43:34	1.43
  +++ ApacheCore.mak	2000/06/22 23:22:17	1.44
  @@ -369,7 +369,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_ALLOC=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -391,7 +391,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_ALLOC=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -417,7 +417,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_BUFF_=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -439,7 +439,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_BUFF_=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -465,7 +465,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_BUILD=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -484,7 +484,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_BUILD=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -513,7 +513,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_HTTP_=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -540,7 +540,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_HTTP_=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -571,7 +571,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_HTTP_C=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -604,7 +604,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_HTTP_C=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -641,7 +641,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_HTTP_L=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -666,7 +666,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_HTTP_L=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -695,7 +695,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_HTTP_M=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -730,7 +730,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_HTTP_M=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -766,7 +766,7 @@
   
   SOURCE=.\main\http_protocol.c
   DEP_CPP_HTTP_P=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -797,7 +797,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_HTTP_R=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -826,7 +826,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_HTTP_R=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -859,7 +859,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_HTTP_V=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -884,7 +884,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_HTTP_V=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -913,7 +913,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_A=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -937,7 +937,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_A=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -965,7 +965,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_AC=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -992,7 +992,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_AC=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1023,7 +1023,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_AL=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1044,7 +1044,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_AL=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1069,7 +1069,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_AS=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1095,7 +1095,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_AS=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1125,7 +1125,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_AU=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1149,7 +1149,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_AU=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1177,7 +1177,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_AUT=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1205,7 +1205,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_AUT=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1237,7 +1237,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_C=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1265,7 +1265,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_C=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1297,7 +1297,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_D=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1324,7 +1324,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_D=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1355,7 +1355,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_E=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1376,7 +1376,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_E=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1401,7 +1401,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_I=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1428,7 +1428,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_I=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1459,7 +1459,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_IN=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1486,7 +1486,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_IN=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1517,7 +1517,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_IS=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1543,7 +1543,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_IS=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1573,7 +1573,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_L=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1596,7 +1596,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_L=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1623,7 +1623,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_M=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1645,7 +1645,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_M=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1671,7 +1671,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_N=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1697,7 +1697,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_N=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1727,7 +1727,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_S=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1750,7 +1750,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_S=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1777,7 +1777,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_SO=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1799,7 +1799,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_SO=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1825,7 +1825,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MOD_U=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1846,7 +1846,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MOD_U=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1871,7 +1871,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_MODUL=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1892,7 +1892,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_MODUL=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1960,7 +1960,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_REGIS=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -1981,7 +1981,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_REGIS=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2006,7 +2006,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_RFC14=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2029,7 +2029,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_RFC14=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2056,7 +2056,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_SERVI=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2082,7 +2082,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_SERVI=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2112,7 +2112,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_UTIL_=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2135,7 +2135,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_UTIL_=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2196,7 +2196,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_UTIL_M=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2218,7 +2218,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_UTIL_M=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2244,7 +2244,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_UTIL_S=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2273,7 +2273,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_UTIL_S=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2306,7 +2306,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_UTIL_U=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2329,7 +2329,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_UTIL_U=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2356,7 +2356,7 @@
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   DEP_CPP_UTIL_W=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  @@ -2377,7 +2377,7 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   DEP_CPP_UTIL_W=\
  -	".\include\alloc.h"\
  +	".\include\ap_alloc.h"\
   	".\include\ap.h"\
   	".\include\ap_config.h"\
   	".\include\ap_ctype.h"\
  
  
  
  1.116     +2 -2      apache-1.3/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/Makefile.tmpl,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- Makefile.tmpl	1999/12/09 17:19:31	1.115
  +++ Makefile.tmpl	2000/06/22 23:22:18	1.116
  @@ -126,9 +126,9 @@
   # DO NOT REMOVE
   buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \
    include/ap_config_auto.h os/unix/os.h include/ap_ctype.h \
  - include/hsregex.h include/httpd.h include/alloc.h include/buff.h \
  + include/hsregex.h include/httpd.h include/ap_alloc.h include/buff.h \
    include/ap.h include/util_uri.h
   modules.o: modules.c include/httpd.h include/ap_config.h \
    include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \
  - include/ap_ctype.h include/hsregex.h include/alloc.h include/buff.h \
  + include/ap_ctype.h include/hsregex.h include/ap_alloc.h include/buff.h \
    include/ap.h include/util_uri.h include/http_config.h
  
  
  
  1.36      +5 -5      apache-1.3/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Makefile.tmpl	1999/08/08 17:59:28	1.35
  +++ Makefile.tmpl	2000/06/22 23:22:21	1.36
  @@ -42,12 +42,12 @@
   ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h
   ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h
   ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
  @@ -64,15 +64,15 @@
   ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h
   ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
   ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h
  
  
  
  1.9       +8 -8      apache-1.3/src/ap/ap.mak
  
  Index: ap.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ap/ap.mak,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ap.mak	2000/05/10 20:43:36	1.8
  +++ ap.mak	2000/06/22 23:22:22	1.9
  @@ -186,7 +186,7 @@
   !IF  "$(CFG)" == "ap - Win32 Release"
   
   DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -205,7 +205,7 @@
   !ELSEIF  "$(CFG)" == "ap - Win32 Debug"
   
   DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -241,7 +241,7 @@
   !IF  "$(CFG)" == "ap - Win32 Release"
   
   DEP_CPP_AP_SI=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -260,7 +260,7 @@
   !ELSEIF  "$(CFG)" == "ap - Win32 Debug"
   
   DEP_CPP_AP_SI=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -283,7 +283,7 @@
   !IF  "$(CFG)" == "ap - Win32 Release"
   
   DEP_CPP_AP_SL=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -303,7 +303,7 @@
   !ELSEIF  "$(CFG)" == "ap - Win32 Debug"
   
   DEP_CPP_AP_SL=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -327,7 +327,7 @@
   !IF  "$(CFG)" == "ap - Win32 Release"
   
   DEP_CPP_AP_SN=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -346,7 +346,7 @@
   !ELSEIF  "$(CFG)" == "ap - Win32 Debug"
   
   DEP_CPP_AP_SN=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  
  
  
  1.47      +2 -1      apache-1.3/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- ap_mmn.h	2000/03/21 05:01:21	1.46
  +++ ap_mmn.h	2000/06/22 23:22:24	1.47
  @@ -228,6 +228,7 @@
    *                        ap_pbase64decode(), ap_pbase64encode()
    * 19990320.7           - add ap_strcasestr()
    * 19990320.8           - add request_rec.case_preserved_filename
  + * 19990320.9           - renamed ap_alloc.h to ap_alloc.h
    */
   
   #define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */
  @@ -235,7 +236,7 @@
   #ifndef MODULE_MAGIC_NUMBER_MAJOR
   #define MODULE_MAGIC_NUMBER_MAJOR 19990320
   #endif
  -#define MODULE_MAGIC_NUMBER_MINOR 8                     /* 0...n */
  +#define MODULE_MAGIC_NUMBER_MINOR 9                     /* 0...n */
   #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR	/* backward compat */
   
   /* Useful for testing for features. */
  
  
  
  1.314     +1 -1      apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.313
  retrieving revision 1.314
  diff -u -r1.313 -r1.314
  --- httpd.h	2000/06/05 16:24:12	1.313
  +++ httpd.h	2000/06/22 23:22:24	1.314
  @@ -69,7 +69,7 @@
   /* Headers in which EVERYONE has an interest... */
   
   #include "ap_config.h"
  -#include "alloc.h"
  +#include "ap_alloc.h"
   #include "buff.h"
   #include "ap.h"
   
  
  
  
  1.36      +15 -15    apache-1.3/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/Makefile.tmpl,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Makefile.tmpl	1999/01/12 15:47:00	1.35
  +++ Makefile.tmpl	2000/06/22 23:22:27	1.36
  @@ -60,30 +60,30 @@
   # DO NOT REMOVE
   alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/multithread.h $(INCDIR)/http_log.h
   buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_log.h
   gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h \
    $(INCDIR)/ap.h $(INCDIR)/util_uri.h
   gen_uri_delims.o: gen_uri_delims.c
   http_config.o: http_config.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_conf_globals.h \
    $(INCDIR)/http_vhost.h $(INCDIR)/explain.h
   http_core.o: http_core.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
  @@ -93,13 +93,13 @@
    $(INCDIR)/fnmatch.h
   http_log.o: http_log.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_main.h
   http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
  @@ -109,7 +109,7 @@
   http_protocol.o: http_protocol.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h \
    $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_request.h \
  @@ -118,7 +118,7 @@
   http_request.o: http_request.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h \
    $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_conf_globals.h \
  @@ -126,19 +126,19 @@
    $(INCDIR)/fnmatch.h
   http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h \
    $(INCDIR)/http_protocol.h
   rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h
   util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h test_char.h
   util_date.o: util_date.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
  @@ -146,12 +146,12 @@
    $(INCDIR)/hsregex.h $(INCDIR)/util_date.h
   util_md5.o: util_md5.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h
   util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  @@ -160,6 +160,6 @@
    $(INCDIR)/util_date.h
   util_uri.o: util_uri.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
  - $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h \
    $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_conf_globals.h uri_delims.h
  
  
  
  1.119     +1 -1      apache-1.3/src/main/alloc.c
  
  Index: alloc.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- alloc.c	2000/06/01 23:42:24	1.118
  +++ alloc.c	2000/06/22 23:22:27	1.119
  @@ -1170,7 +1170,7 @@
    */
   
   /* XXX: if you tweak this you should look at is_empty_table() and table_elts()
  - * in alloc.h */
  + * in ap_alloc.h */
   struct table {
       /* This has to be first to promote backwards compatibility with
        * older modules which cast a table * to an array_header *...
  
  
  
  1.4       +2 -2      apache-1.3/src/main/gen_test_char.mak
  
  Index: gen_test_char.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/gen_test_char.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gen_test_char.mak	2000/05/10 20:43:40	1.3
  +++ gen_test_char.mak	2000/06/22 23:22:28	1.4
  @@ -195,7 +195,7 @@
   !IF  "$(CFG)" == "gen_test_char - Win32 Release"
   
   DEP_CPP_GEN_T=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -214,7 +214,7 @@
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
   DEP_CPP_GEN_T=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  
  
  
  1.11      +1 -1      apache-1.3/src/modules/example/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/example/Makefile.tmpl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.tmpl	1998/09/07 06:59:33	1.10
  +++ Makefile.tmpl	2000/06/22 23:22:32	1.11
  @@ -8,7 +8,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
  
  
  
  1.16      +2 -2      apache-1.3/src/modules/experimental/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/experimental/Makefile.tmpl,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Makefile.tmpl	1999/08/17 19:29:58	1.15
  +++ Makefile.tmpl	2000/06/22 23:22:33	1.16
  @@ -8,7 +8,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h
  @@ -16,7 +16,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \
  
  
  
  1.16      +12 -12    apache-1.3/src/modules/proxy/ApacheModuleProxy.mak
  
  Index: ApacheModuleProxy.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.mak,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApacheModuleProxy.mak	2000/05/10 20:43:42	1.15
  +++ ApacheModuleProxy.mak	2000/06/22 23:22:35	1.16
  @@ -214,7 +214,7 @@
   !IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
   
   DEP_CPP_MOD_P=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -240,7 +240,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
   DEP_CPP_MOD_P=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -270,7 +270,7 @@
   !IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
   
   DEP_CPP_PROXY=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -299,7 +299,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
   DEP_CPP_PROXY=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -332,7 +332,7 @@
   !IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
   
   DEP_CPP_PROXY_=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -357,7 +357,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
   DEP_CPP_PROXY_=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -386,7 +386,7 @@
   !IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
   
   DEP_CPP_PROXY_F=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -412,7 +412,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
   DEP_CPP_PROXY_F=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -442,7 +442,7 @@
   !IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
   
   DEP_CPP_PROXY_H=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -469,7 +469,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
   DEP_CPP_PROXY_H=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -500,7 +500,7 @@
   !IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
   
   DEP_CPP_PROXY_U=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -528,7 +528,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
   
   DEP_CPP_PROXY_U=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.27      +6 -6      apache-1.3/src/modules/proxy/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Makefile.tmpl	1999/05/04 11:21:13	1.26
  +++ Makefile.tmpl	2000/06/22 23:22:35	1.27
  @@ -61,7 +61,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h \
  @@ -70,7 +70,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  @@ -80,7 +80,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_main.h
  @@ -88,7 +88,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_log.h
  @@ -96,7 +96,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  @@ -105,7 +105,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \
    $(INCDIR)/http_main.h $(INCDIR)/ap_md5.h \
  
  
  
  1.23      +33 -33    apache-1.3/src/modules/standard/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/Makefile.tmpl,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Makefile.tmpl	1998/09/07 06:59:35	1.22
  +++ Makefile.tmpl	2000/06/22 23:22:40	1.23
  @@ -8,7 +8,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_request.h
  @@ -16,7 +16,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  @@ -25,12 +25,12 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
   mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
    $(INCDIR)/util_script.h $(INCDIR)/http_main.h \
  @@ -38,7 +38,7 @@
   mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_protocol.h
  @@ -46,7 +46,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h
  @@ -54,7 +54,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_protocol.h
  @@ -62,7 +62,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_protocol.h
  @@ -70,7 +70,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  @@ -79,14 +79,14 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/util_script.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_request.h
   mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  @@ -96,7 +96,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \
  @@ -104,7 +104,7 @@
   mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  @@ -112,25 +112,25 @@
   mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
   mod_expires.o: mod_expires.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_log.h
   mod_headers.o: mod_headers.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
   mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  @@ -139,7 +139,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  @@ -147,7 +147,7 @@
   mod_info.o: mod_info.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
    $(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
  @@ -156,34 +156,34 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_log.h
   mod_log_config.o: mod_log_config.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h
   mod_log_referer.o: mod_log_referer.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_log.h
   mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_log.h
   mod_mime_magic.o: mod_mime_magic.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
  @@ -191,7 +191,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_log.h $(INCDIR)/util_script.h
  @@ -199,7 +199,7 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_conf_globals.h $(INCDIR)/http_request.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  @@ -208,27 +208,27 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_log.h
   mod_so.o: mod_so.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_log.h
   mod_speling.o: mod_speling.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_log.h
   mod_status.o: mod_status.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
    $(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \
  @@ -238,19 +238,19 @@
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_log.h $(INCDIR)/multithread.h
   mod_userdir.o: mod_userdir.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h
   mod_usertrack.o: mod_usertrack.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
    $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
    $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
    $(INCDIR)/http_core.h
  
  
  
  1.12      +2 -2      apache-1.3/src/modules/test/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/test/Makefile.tmpl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.tmpl	1998/07/20 16:20:23	1.11
  +++ Makefile.tmpl	2000/06/22 23:22:46	1.12
  @@ -7,12 +7,12 @@
   mod_rndchunk.o: mod_rndchunk.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_protocol.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_main.h
   mod_test_util_uri.o: mod_test_util_uri.c $(INCDIR)/httpd.h \
    $(INCDIR)/ap_config.h $(INCDIR)/ap_config_auto.h \
    $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
  - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
    $(INCDIR)/util_uri.h $(INCDIR)/http_protocol.h \
    $(INCDIR)/http_config.h $(INCDIR)/http_main.h
  
  
  
  1.11      +2 -2      apache-1.3/src/os/bs2000/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.tmpl	1999/07/07 11:02:00	1.10
  +++ Makefile.tmpl	2000/06/22 23:22:51	1.11
  @@ -46,7 +46,7 @@
   bs2login.o: os.h
   bs2login.o: $(INCDIR)/ap_ctype.h
   bs2login.o: $(INCDIR)/hsregex.h
  -bs2login.o: $(INCDIR)/alloc.h
  +bs2login.o: $(INCDIR)/ap_alloc.h
   bs2login.o: $(INCDIR)/buff.h
   bs2login.o: $(INCDIR)/ap.h
   bs2login.o: ebcdic.h
  @@ -76,7 +76,7 @@
   os.o: os.h
   os.o: $(INCDIR)/ap_ctype.h
   os.o: $(INCDIR)/hsregex.h
  -os.o: $(INCDIR)/alloc.h
  +os.o: $(INCDIR)/ap_alloc.h
   os.o: $(INCDIR)/buff.h
   os.o: $(INCDIR)/ap.h
   os.o: ebcdic.h
  
  
  
  1.12      +1 -1      apache-1.3/src/os/os2/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/os2/Makefile.tmpl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.tmpl	1999/04/07 10:33:58	1.11
  +++ Makefile.tmpl	2000/06/22 23:22:52	1.12
  @@ -53,5 +53,5 @@
   util_os2.o: util_os2.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
    $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
    $(INCDIR)/os.h $(INCDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
  - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/hsregex.h $(INCDIR)/ap_alloc.h $(INCDIR)/buff.h \
    $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
  
  
  
  1.2       +1 -1      apache-1.3/src/os/os390/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/os390/Makefile.tmpl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.tmpl	1999/12/09 17:12:09	1.1
  +++ Makefile.tmpl	2000/06/22 23:22:54	1.2
  @@ -62,7 +62,7 @@
   os.o: os.h
   os.o: $(INCDIR)/ap_ctype.h
   os.o: $(INCDIR)/hsregex.h
  -os.o: $(INCDIR)/alloc.h
  +os.o: $(INCDIR)/ap_alloc.h
   os.o: $(INCDIR)/buff.h
   os.o: $(INCDIR)/ap.h
   os.o: ebcdic.h
  
  
  
  1.6       +1 -1      apache-1.3/src/os/tpf/os.c
  
  Index: os.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/tpf/os.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- os.c	1999/09/01 04:29:05	1.5
  +++ os.c	2000/06/22 23:22:54	1.6
  @@ -626,7 +626,7 @@
   #endif
   };
   
  -#include "alloc.h"
  +#include "ap_alloc.h"
   #define POOL_HDR_CLICKS (1 + ((sizeof(struct pool) - 1) / CLICK_SZ))
   #define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ)
   
  
  
  
  1.14      +2 -2      apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak
  
  Index: ApacheModuleAuthAnon.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthAnon.mak,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApacheModuleAuthAnon.mak	2000/05/10 20:43:46	1.13
  +++ ApacheModuleAuthAnon.mak	2000/06/22 23:22:56	1.14
  @@ -195,7 +195,7 @@
   !IF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
   
   DEP_CPP_MOD_A=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -220,7 +220,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
   
   DEP_CPP_MOD_A=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.3       +2 -2      apache-1.3/src/os/win32/ApacheModuleAuthDigest.mak
  
  Index: ApacheModuleAuthDigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleAuthDigest.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleAuthDigest.mak	2000/05/10 20:43:46	1.2
  +++ ApacheModuleAuthDigest.mak	2000/06/22 23:22:57	1.3
  @@ -227,7 +227,7 @@
   !IF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Release"
   
   DEP_CPP_MOD_A=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -263,7 +263,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthDigest - Win32 Debug"
   
   DEP_CPP_MOD_A=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.14      +2 -2      apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak
  
  Index: ApacheModuleCERNMeta.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleCERNMeta.mak,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApacheModuleCERNMeta.mak	2000/05/10 20:43:46	1.13
  +++ ApacheModuleCERNMeta.mak	2000/06/22 23:22:57	1.14
  @@ -195,7 +195,7 @@
   !IF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
   
   DEP_CPP_MOD_C=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -219,7 +219,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
   
   DEP_CPP_MOD_C=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.15      +2 -2      apache-1.3/src/os/win32/ApacheModuleDigest.mak
  
  Index: ApacheModuleDigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleDigest.mak,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheModuleDigest.mak	2000/05/10 20:43:47	1.14
  +++ ApacheModuleDigest.mak	2000/06/22 23:22:57	1.15
  @@ -193,7 +193,7 @@
   !IF  "$(CFG)" == "ApacheModuleDigest - Win32 Release"
   
   DEP_CPP_MOD_D=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -219,7 +219,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
   
   DEP_CPP_MOD_D=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.14      +2 -2      apache-1.3/src/os/win32/ApacheModuleExpires.mak
  
  Index: ApacheModuleExpires.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleExpires.mak,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApacheModuleExpires.mak	2000/05/10 20:43:47	1.13
  +++ ApacheModuleExpires.mak	2000/06/22 23:22:57	1.14
  @@ -193,7 +193,7 @@
   !IF  "$(CFG)" == "ApacheModuleExpires - Win32 Release"
   
   DEP_CPP_MOD_E=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -215,7 +215,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
   
   DEP_CPP_MOD_E=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.14      +2 -2      apache-1.3/src/os/win32/ApacheModuleHeaders.mak
  
  Index: ApacheModuleHeaders.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleHeaders.mak,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApacheModuleHeaders.mak	2000/05/10 20:43:47	1.13
  +++ ApacheModuleHeaders.mak	2000/06/22 23:22:57	1.14
  @@ -193,7 +193,7 @@
   !IF  "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
   
   DEP_CPP_MOD_H=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -214,7 +214,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
   
   DEP_CPP_MOD_H=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.11      +2 -2      apache-1.3/src/os/win32/ApacheModuleInfo.mak
  
  Index: ApacheModuleInfo.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleInfo.mak,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ApacheModuleInfo.mak	2000/05/10 20:43:47	1.10
  +++ ApacheModuleInfo.mak	2000/06/22 23:22:57	1.11
  @@ -192,7 +192,7 @@
   !IF  "$(CFG)" == "ApacheModuleInfo - Win32 Release"
   
   DEP_CPP_MOD_I=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -219,7 +219,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
   
   DEP_CPP_MOD_I=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.15      +2 -2      apache-1.3/src/os/win32/ApacheModuleRewrite.mak
  
  Index: ApacheModuleRewrite.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleRewrite.mak,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApacheModuleRewrite.mak	2000/05/10 20:43:48	1.14
  +++ ApacheModuleRewrite.mak	2000/06/22 23:22:58	1.15
  @@ -200,7 +200,7 @@
   !IF  "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
   
   DEP_CPP_MOD_R=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -227,7 +227,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
   
   DEP_CPP_MOD_R=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.8       +2 -2      apache-1.3/src/os/win32/ApacheModuleSpeling.mak
  
  Index: ApacheModuleSpeling.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleSpeling.mak,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ApacheModuleSpeling.mak	2000/05/10 20:43:48	1.7
  +++ ApacheModuleSpeling.mak	2000/06/22 23:22:58	1.8
  @@ -193,7 +193,7 @@
   !IF  "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
   
   DEP_CPP_MOD_S=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -216,7 +216,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
   
   DEP_CPP_MOD_S=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.16      +2 -2      apache-1.3/src/os/win32/ApacheModuleStatus.mak
  
  Index: ApacheModuleStatus.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleStatus.mak,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApacheModuleStatus.mak	2000/05/10 20:43:48	1.15
  +++ ApacheModuleStatus.mak	2000/06/22 23:22:58	1.16
  @@ -193,7 +193,7 @@
   !IF  "$(CFG)" == "ApacheModuleStatus - Win32 Release"
   
   DEP_CPP_MOD_S=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -221,7 +221,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
   
   DEP_CPP_MOD_S=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.14      +2 -2      apache-1.3/src/os/win32/ApacheModuleUserTrack.mak
  
  Index: ApacheModuleUserTrack.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheModuleUserTrack.mak,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApacheModuleUserTrack.mak	2000/05/10 20:43:49	1.13
  +++ ApacheModuleUserTrack.mak	2000/06/22 23:22:58	1.14
  @@ -195,7 +195,7 @@
   !IF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
   
   DEP_CPP_MOD_U=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  @@ -217,7 +217,7 @@
   !ELSEIF  "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
   
   DEP_CPP_MOD_U=\
  -	"..\..\include\alloc.h"\
  +	"..\..\include\ap_alloc.h"\
   	"..\..\include\ap.h"\
   	"..\..\include\ap_config.h"\
   	"..\..\include\ap_ctype.h"\
  
  
  
  1.3       +1 -1      apache-1.3/src/os/win32/Module.mak.tmpl
  
  Index: Module.mak.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/Module.mak.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Module.mak.tmpl	1998/08/13 01:55:24	1.2
  +++ Module.mak.tmpl	2000/06/22 23:22:58	1.3
  @@ -202,7 +202,7 @@
   
   SOURCE=\work\apache\src\%Source%.c
   DEP_CPP_MOD_A=\
  -	"..\alloc.h"\
  +	"..\ap_alloc.h"\
   	"..\buff.h"\
   	"..\conf.h"\
   	"..\http_config.h"\
  
  
  
  1.5       +1 -1      apache-1.3/src/os/win32/installer/installdll/install.mak
  
  Index: install.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/installer/installdll/install.mak,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- install.mak	2000/05/10 20:43:52	1.4
  +++ install.mak	2000/06/22 23:23:05	1.5
  @@ -183,7 +183,7 @@
    "install - Win32 Debug"
   SOURCE=..\..\..\..\ap\ap_snprintf.c
   DEP_CPP_AP_SN=\
  -	"..\..\..\..\include\alloc.h"\
  +	"..\..\..\..\include\ap_alloc.h"\
   	"..\..\..\..\include\ap.h"\
   	"..\..\..\..\include\ap_config.h"\
   	"..\..\..\..\include\ap_ctype.h"\
  
  
  
  1.4       +2 -2      apache-1.3/src/support/htdigest.mak
  
  Index: htdigest.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htdigest.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- htdigest.mak	2000/05/10 20:43:54	1.3
  +++ htdigest.mak	2000/06/22 23:23:15	1.4
  @@ -182,7 +182,7 @@
   !IF  "$(CFG)" == "htdigest - Win32 Release"
   
   DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -202,7 +202,7 @@
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
   
   DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  
  
  
  1.12      +4 -4      apache-1.3/src/support/htpasswd.mak
  
  Index: htpasswd.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/htpasswd.mak,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- htpasswd.mak	2000/05/10 20:43:54	1.11
  +++ htpasswd.mak	2000/06/22 23:23:18	1.12
  @@ -270,7 +270,7 @@
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -290,7 +290,7 @@
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
   DEP_CPP_AP_CP=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -420,7 +420,7 @@
   !IF  "$(CFG)" == "htpasswd - Win32 Release"
   
   DEP_CPP_AP_SN=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  @@ -440,7 +440,7 @@
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
   DEP_CPP_AP_SN=\
  -	"..\include\alloc.h"\
  +	"..\include\ap_alloc.h"\
   	"..\include\ap.h"\
   	"..\include\ap_config.h"\
   	"..\include\ap_ctype.h"\
  
  
  
  1.2       +1 -1      apache-1.3/src/test/test_find.c
  
  Index: test_find.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/test/test_find.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- test_find.c	1999/02/11 16:24:11	1.1
  +++ test_find.c	2000/06/22 23:23:26	1.2
  @@ -13,7 +13,7 @@
   #include <stdio.h>
   #include <stdlib.h>
   #include "httpd.h"
  -#include "alloc.h"
  +#include "ap_alloc.h"
   
   /*
    * Dummy a bunch of stuff just to get a compile
  
  
  
  1.4       +1 -1      apache-1.3/src/test/test_parser.c
  
  Index: test_parser.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/test/test_parser.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- test_parser.c	1999/02/11 16:24:11	1.3
  +++ test_parser.c	2000/06/22 23:23:27	1.4
  @@ -13,7 +13,7 @@
   #include <stdio.h>
   #include <stdlib.h>
   #include "httpd.h"
  -#include "alloc.h"
  +#include "ap_alloc.h"
   
   /*
    * Dummy a bunch of stuff just to get a compile
  
  
  

Mime
View raw message