Appears strftime wasn't adaquate on win32 (nor were stat and spawn), but

  any 3rd party anything needs these same sources we use for the core.

  Rather than linking to the core, this patch moves that family into the
  ApacheOS library.

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

diff --git a/src/ApacheCore.mak b/src/ApacheCore.mak
index cc7165e8e1d9f08ed98f0ae91a70b4a4c8bd3a0f..10deb13172f15a3a63390a4ae6f2875d7dd7b4db 100644 (file)
--- a/src/ApacheCore.mak
+++ b/src/ApacheCore.mak
@@ -368,6 +368,7 @@ DEP_CPP_ALLOC=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -380,7 +381,6 @@ DEP_CPP_ALLOC=\
        
 NODEP_CPP_ALLOC=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -394,6 +394,7 @@ DEP_CPP_BUFF_=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -406,7 +407,6 @@ DEP_CPP_BUFF_=\
        
 NODEP_CPP_BUFF_=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -420,6 +420,7 @@ DEP_CPP_BUILD=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -430,7 +431,6 @@ DEP_CPP_BUILD=\
        
 NODEP_CPP_BUILD=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -449,6 +449,7 @@ DEP_CPP_HTTP_=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\explain.h"\
@@ -466,7 +467,6 @@ DEP_CPP_HTTP_=\
        
 NODEP_CPP_HTTP_=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -480,6 +480,7 @@ DEP_CPP_HTTP_C=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_md5.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
@@ -503,7 +504,6 @@ DEP_CPP_HTTP_C=\
        
 NODEP_CPP_HTTP_C=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -517,6 +517,7 @@ DEP_CPP_HTTP_L=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -532,7 +533,6 @@ DEP_CPP_HTTP_L=\
        
 NODEP_CPP_HTTP_L=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -546,6 +546,7 @@ DEP_CPP_HTTP_M=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\explain.h"\
@@ -571,7 +572,6 @@ DEP_CPP_HTTP_M=\
        
 NODEP_CPP_HTTP_M=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        ".\main\xmlparse.h"\
        
@@ -586,6 +586,7 @@ DEP_CPP_HTTP_P=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -605,7 +606,6 @@ DEP_CPP_HTTP_P=\
        
 NODEP_CPP_HTTP_P=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -619,6 +619,7 @@ DEP_CPP_HTTP_R=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\fnmatch.h"\
@@ -638,7 +639,6 @@ DEP_CPP_HTTP_R=\
        
 NODEP_CPP_HTTP_R=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -652,6 +652,7 @@ DEP_CPP_HTTP_V=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -667,7 +668,6 @@ DEP_CPP_HTTP_V=\
        
 NODEP_CPP_HTTP_V=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -681,6 +681,7 @@ DEP_CPP_MOD_A=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -695,7 +696,6 @@ DEP_CPP_MOD_A=\
        
 NODEP_CPP_MOD_A=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -709,6 +709,7 @@ DEP_CPP_MOD_AC=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -726,7 +727,6 @@ DEP_CPP_MOD_AC=\
        
 NODEP_CPP_MOD_AC=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -740,6 +740,7 @@ DEP_CPP_MOD_AL=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -751,7 +752,6 @@ DEP_CPP_MOD_AL=\
        
 NODEP_CPP_MOD_AL=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -765,6 +765,7 @@ DEP_CPP_MOD_AS=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -781,7 +782,6 @@ DEP_CPP_MOD_AS=\
        
 NODEP_CPP_MOD_AS=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -795,6 +795,7 @@ DEP_CPP_MOD_AU=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -809,7 +810,6 @@ DEP_CPP_MOD_AU=\
        
 NODEP_CPP_MOD_AU=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -823,6 +823,7 @@ DEP_CPP_MOD_AUT=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\fnmatch.h"\
@@ -841,7 +842,6 @@ DEP_CPP_MOD_AUT=\
        
 NODEP_CPP_MOD_AUT=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -855,6 +855,7 @@ DEP_CPP_MOD_C=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -873,7 +874,6 @@ DEP_CPP_MOD_C=\
        
 NODEP_CPP_MOD_C=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -887,6 +887,7 @@ DEP_CPP_MOD_D=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -904,7 +905,6 @@ DEP_CPP_MOD_D=\
        
 NODEP_CPP_MOD_D=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -918,6 +918,7 @@ DEP_CPP_MOD_E=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -929,7 +930,6 @@ DEP_CPP_MOD_E=\
        
 NODEP_CPP_MOD_E=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -943,6 +943,7 @@ DEP_CPP_MOD_I=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -960,7 +961,6 @@ DEP_CPP_MOD_I=\
        
 NODEP_CPP_MOD_I=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -974,6 +974,7 @@ DEP_CPP_MOD_IN=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -991,7 +992,6 @@ DEP_CPP_MOD_IN=\
        
 NODEP_CPP_MOD_IN=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        ".\modules\standard\config.h"\
        ".\modules\standard\modules\perl\mod_perl.h"\
@@ -1007,6 +1007,7 @@ DEP_CPP_MOD_IS=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1023,7 +1024,6 @@ DEP_CPP_MOD_IS=\
        
 NODEP_CPP_MOD_IS=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1037,6 +1037,7 @@ DEP_CPP_MOD_L=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1050,7 +1051,6 @@ DEP_CPP_MOD_L=\
        
 NODEP_CPP_MOD_L=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1064,6 +1064,7 @@ DEP_CPP_MOD_M=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1076,7 +1077,6 @@ DEP_CPP_MOD_M=\
        
 NODEP_CPP_MOD_M=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1090,6 +1090,7 @@ DEP_CPP_MOD_N=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1106,7 +1107,6 @@ DEP_CPP_MOD_N=\
        
 NODEP_CPP_MOD_N=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1120,6 +1120,7 @@ DEP_CPP_MOD_S=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1133,7 +1134,6 @@ DEP_CPP_MOD_S=\
        
 NODEP_CPP_MOD_S=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1147,6 +1147,7 @@ DEP_CPP_MOD_SO=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1159,7 +1160,6 @@ DEP_CPP_MOD_SO=\
        
 NODEP_CPP_MOD_SO=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1173,6 +1173,7 @@ DEP_CPP_MOD_U=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1184,7 +1185,6 @@ DEP_CPP_MOD_U=\
        
 NODEP_CPP_MOD_U=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1198,6 +1198,7 @@ DEP_CPP_MODUL=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1209,7 +1210,6 @@ DEP_CPP_MODUL=\
        
 NODEP_CPP_MODUL=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1249,6 +1249,7 @@ DEP_CPP_REGIS=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1260,7 +1261,6 @@ DEP_CPP_REGIS=\
        
 NODEP_CPP_REGIS=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1274,6 +1274,7 @@ DEP_CPP_RFC14=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1287,7 +1288,6 @@ DEP_CPP_RFC14=\
        
 NODEP_CPP_RFC14=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1301,6 +1301,7 @@ DEP_CPP_SERVI=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1318,7 +1319,6 @@ DEP_CPP_SERVI=\
        
 NODEP_CPP_SERVI=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1332,6 +1332,7 @@ DEP_CPP_UTIL_=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1345,7 +1346,6 @@ DEP_CPP_UTIL_=\
        
 NODEP_CPP_UTIL_=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1376,6 +1376,7 @@ DEP_CPP_UTIL_M=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_md5.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
@@ -1388,7 +1389,6 @@ DEP_CPP_UTIL_M=\
        
 NODEP_CPP_UTIL_M=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1402,6 +1402,7 @@ DEP_CPP_UTIL_S=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1421,7 +1422,6 @@ DEP_CPP_UTIL_S=\
        
 NODEP_CPP_UTIL_S=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1435,6 +1435,7 @@ DEP_CPP_UTIL_U=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1448,7 +1449,6 @@ DEP_CPP_UTIL_U=\
        
 NODEP_CPP_UTIL_U=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 
@@ -1462,6 +1462,7 @@ DEP_CPP_UTIL_W=\
        ".\include\ap_alloc.h"\
        ".\include\ap_config.h"\
        ".\include\ap_ctype.h"\
+       ".\include\ap_ebcdic.h"\
        ".\include\ap_mmn.h"\
        ".\include\buff.h"\
        ".\include\hsregex.h"\
@@ -1473,7 +1474,6 @@ DEP_CPP_UTIL_W=\
        
 NODEP_CPP_UTIL_W=\
        ".\include\ap_config_auto.h"\
-       ".\include\ebcdic.h"\
        ".\include\sfio.h"\
        
 

diff --git a/src/ap/ap.mak b/src/ap/ap.mak
index 8a36bf92e2d511f502971b1b1c4bbec8984de14a..e0c5cb777f9efeca71a1c618d35dbef008db4c35 100644 (file)
--- a/src/ap/ap.mak
+++ b/src/ap/ap.mak
@@ -189,13 +189,13 @@ DEP_CPP_AP_BA=\
        "..\include\ap.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\hsregex.h"\
        "..\os\win32\os.h"\
        
 NODEP_CPP_AP_BA=\
        "..\include\ap_config_auto.h"\
-       ".\ebcdic.h"\
        
 
 "$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
@@ -225,6 +225,7 @@ DEP_CPP_AP_CP=\
        "..\include\ap_alloc.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\buff.h"\
        "..\include\hsregex.h"\
@@ -235,7 +236,6 @@ DEP_CPP_AP_CP=\
        
 NODEP_CPP_AP_CP=\
        "..\include\ap_config_auto.h"\
-       "..\include\ebcdic.h"\
        "..\include\sfio.h"\
        
 
@@ -263,6 +263,7 @@ DEP_CPP_AP_MD=\
        "..\include\ap.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_md5.h"\
        "..\include\ap_mmn.h"\
        "..\include\hsregex.h"\
@@ -270,7 +271,6 @@ DEP_CPP_AP_MD=\
        
 NODEP_CPP_AP_MD=\
        "..\include\ap_config_auto.h"\
-       ".\ebcdic.h"\
        
 
 "$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
@@ -281,6 +281,7 @@ DEP_CPP_AP_SH=\
        "..\include\ap.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\ap_sha1.h"\
        "..\include\hsregex.h"\
@@ -288,7 +289,6 @@ DEP_CPP_AP_SH=\
        
 NODEP_CPP_AP_SH=\
        "..\include\ap_config_auto.h"\
-       ".\ebcdic.h"\
        
 
 "$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
@@ -300,6 +300,7 @@ DEP_CPP_AP_SI=\
        "..\include\ap_alloc.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\buff.h"\
        "..\include\hsregex.h"\
@@ -310,7 +311,6 @@ DEP_CPP_AP_SI=\
        
 NODEP_CPP_AP_SI=\
        "..\include\ap_config_auto.h"\
-       "..\include\ebcdic.h"\
        "..\include\sfio.h"\
        
 
@@ -323,6 +323,7 @@ DEP_CPP_AP_SL=\
        "..\include\ap_alloc.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\buff.h"\
        "..\include\hsregex.h"\
@@ -334,7 +335,6 @@ DEP_CPP_AP_SL=\
        
 NODEP_CPP_AP_SL=\
        "..\include\ap_config_auto.h"\
-       "..\include\ebcdic.h"\
        "..\include\sfio.h"\
        
 
@@ -347,6 +347,7 @@ DEP_CPP_AP_SN=\
        "..\include\ap_alloc.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\buff.h"\
        "..\include\hsregex.h"\
@@ -357,7 +358,6 @@ DEP_CPP_AP_SN=\
        
 NODEP_CPP_AP_SN=\
        "..\include\ap_config_auto.h"\
-       "..\include\ebcdic.h"\
        "..\include\sfio.h"\
        
 

diff --git a/src/main/gen_test_char.mak b/src/main/gen_test_char.mak
index b663a374c69f0fe0f83555ea468de161541b9b5f..8a3fdfd4e4d7dc7ffe1ff7b415415e6846ceb3a1 100644 (file)
--- a/src/main/gen_test_char.mak
+++ b/src/main/gen_test_char.mak
@@ -195,6 +195,7 @@ DEP_CPP_GEN_T=\
        "..\include\ap_alloc.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\buff.h"\
        "..\include\hsregex.h"\
@@ -205,7 +206,6 @@ DEP_CPP_GEN_T=\
        
 NODEP_CPP_GEN_T=\
        "..\include\ap_config_auto.h"\
-       "..\include\ebcdic.h"\
        "..\include\sfio.h"\
        
 

diff --git a/src/os/win32/ApacheOS.dsp b/src/os/win32/ApacheOS.dsp
index 52fc964829948ac9f9ed19497f334cca18ef355c..564a68dac2ced4d05a7d8824da6b1c5c1f9b6813 100755 (executable)
--- a/src/os/win32/ApacheOS.dsp
+++ b/src/os/win32/ApacheOS.dsp
@@ -39,6 +39,7 @@ CPP=cl.exe
 # PROP Output_Dir "LibR"
 # PROP Intermediate_Dir "LibR"
 # PROP Target_Dir ""
+RSC=rc.exe
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
 # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fd"LibR\ApacheOS" /FD /c
 BSC32=bscmake.exe
@@ -60,6 +61,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "LibD"
 # PROP Intermediate_Dir "LibD"
 # PROP Target_Dir ""
+RSC=rc.exe
 # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
 # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"LibD\ApacheOS" /FD /c
 BSC32=bscmake.exe

diff --git a/src/os/win32/mod_auth_anon.mak b/src/os/win32/mod_auth_anon.mak
index f25f826d9d047ba7fd9a09957b551f7ee7b45fa4..3166a11958fdf0dd870aed74ae3a7f34b14e0c3d 100644 (file)
--- a/src/os/win32/mod_auth_anon.mak
+++ b/src/os/win32/mod_auth_anon.mak
@@ -219,6 +219,7 @@ DEP_CPP_MOD_A=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -234,7 +235,6 @@ DEP_CPP_MOD_A=\
        
 NODEP_CPP_MOD_A=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_auth_dbm.mak b/src/os/win32/mod_auth_dbm.mak
index 87b5db067173a6f2030daa454edc156ef607de29..a27281b0783e13a9bf6ef00cf4beb8d7f7d24ce7 100644 (file)
--- a/src/os/win32/mod_auth_dbm.mak
+++ b/src/os/win32/mod_auth_dbm.mak
@@ -251,6 +251,7 @@ DEP_CPP_MOD_A=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -266,7 +267,6 @@ DEP_CPP_MOD_A=\
        
 NODEP_CPP_MOD_A=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_auth_digest.mak b/src/os/win32/mod_auth_digest.mak
index 82f24a5806bccf27a62c559dd7774c04a843bec2..197a2a91fc04c9337db85af34dad127f808447ef 100644 (file)
--- a/src/os/win32/mod_auth_digest.mak
+++ b/src/os/win32/mod_auth_digest.mak
@@ -221,6 +221,7 @@ DEP_CPP_MOD_A=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_md5.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\ap_sha1.h"\
@@ -240,7 +241,6 @@ DEP_CPP_MOD_A=\
        
 NODEP_CPP_MOD_A=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        "..\..\modules\experimental\mm.h"\
        

diff --git a/src/os/win32/mod_cern_meta.mak b/src/os/win32/mod_cern_meta.mak
index 1eb0bc23b6b0508d7686bd6925d90295973fdfd1..0bd858ceaa1c2e6cbca506267914d745d6d7af60 100644 (file)
--- a/src/os/win32/mod_cern_meta.mak
+++ b/src/os/win32/mod_cern_meta.mak
@@ -219,6 +219,7 @@ DEP_CPP_MOD_C=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -233,7 +234,6 @@ DEP_CPP_MOD_C=\
        
 NODEP_CPP_MOD_C=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_digest.mak b/src/os/win32/mod_digest.mak
index ba7fb6376e41c8d67cb663e770d9f2bbe5d66f54..833732228fc074d771b87b9250f4c7de80577df0 100644 (file)
--- a/src/os/win32/mod_digest.mak
+++ b/src/os/win32/mod_digest.mak
@@ -218,6 +218,7 @@ DEP_CPP_MOD_D=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_md5.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
@@ -234,7 +235,6 @@ DEP_CPP_MOD_D=\
        
 NODEP_CPP_MOD_D=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_expires.mak b/src/os/win32/mod_expires.mak
index 316cb091f0d4f4c2471390b5449205532bbb0695..79010391e3e7bbeeb172a3fb165839db7cb95868 100644 (file)
--- a/src/os/win32/mod_expires.mak
+++ b/src/os/win32/mod_expires.mak
@@ -218,6 +218,7 @@ DEP_CPP_MOD_E=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -230,7 +231,6 @@ DEP_CPP_MOD_E=\
        
 NODEP_CPP_MOD_E=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_headers.mak b/src/os/win32/mod_headers.mak
index 1c07bc2abddd6f70cb6880299e06bcae06b07547..ff38c7a17df2139124b921b18d2fa887fba3ab92 100644 (file)
--- a/src/os/win32/mod_headers.mak
+++ b/src/os/win32/mod_headers.mak
@@ -218,6 +218,7 @@ DEP_CPP_MOD_H=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -229,7 +230,6 @@ DEP_CPP_MOD_H=\
        
 NODEP_CPP_MOD_H=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_info.mak b/src/os/win32/mod_info.mak
index 8ab91af23674fdc7721244177f097fe8d4255ebd..bb48938677a453c90591cdd0fffceaa2aeacae61 100644 (file)
--- a/src/os/win32/mod_info.mak
+++ b/src/os/win32/mod_info.mak
@@ -217,6 +217,7 @@ DEP_CPP_MOD_I=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -234,7 +235,6 @@ DEP_CPP_MOD_I=\
        
 NODEP_CPP_MOD_I=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_proxy.mak b/src/os/win32/mod_proxy.mak
index 97b4ea2749805e22ee4ca5b410f21f559e71e49b..a37661e1f4b34e592a7e44d3f09d2e5e0d61f7cc 100644 (file)
--- a/src/os/win32/mod_proxy.mak
+++ b/src/os/win32/mod_proxy.mak
@@ -28,6 +28,10 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "mod_proxy - Win32 Release"
 
 OUTDIR=.\Release
@@ -66,46 +70,12 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
 CPP_PROJ=/nologo /MD /W3 /O2 /I "..\..\include" /I "..\..\os\win32" /I\
  "..\..\modules\proxy" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c 
 CPP_OBJS=.\Release/
 CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
 BSC32_SBRS= \
@@ -168,12 +138,36 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
 CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I\
  "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE"\
  /D "WIN32_LEAN_AND_MEAN" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_proxy" /FD /c 
 CPP_OBJS=.\Debug/
 CPP_SBRS=.
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
+ /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\
+ /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\
+ /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy 
+LINK32_OBJS= \
+       "$(INTDIR)\mod_proxy.obj" \
+       "$(INTDIR)\proxy_cache.obj" \
+       "$(INTDIR)\proxy_connect.obj" \
+       "$(INTDIR)\proxy_ftp.obj" \
+       "$(INTDIR)\proxy_http.obj" \
+       "$(INTDIR)\proxy_util.obj" \
+       "..\..\Debug\ApacheCore.lib"
+
+"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(CPP_OBJS)}.obj::
    $(CPP) @<<
@@ -205,34 +199,6 @@ CPP_SBRS=.
    $(CPP_PROJ) $< 
 <<
 
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_proxy.bsc" 
-BSC32_SBRS= \
-       
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib ws2_32.lib /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\mod_proxy.pdb" /map:"$(INTDIR)\mod_proxy.map"\
- /debug /machine:I386 /out:"$(OUTDIR)\mod_proxy.so"\
- /implib:"$(OUTDIR)\mod_proxy.lib" /base:@"BaseAddr.ref",mod_proxy 
-LINK32_OBJS= \
-       "$(INTDIR)\mod_proxy.obj" \
-       "$(INTDIR)\proxy_cache.obj" \
-       "$(INTDIR)\proxy_connect.obj" \
-       "$(INTDIR)\proxy_ftp.obj" \
-       "$(INTDIR)\proxy_http.obj" \
-       "$(INTDIR)\proxy_util.obj" \
-       "..\..\Debug\ApacheCore.lib"
-
-"$(OUTDIR)\mod_proxy.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(CFG)" == "mod_proxy - Win32 Release" || "$(CFG)" ==\
  "mod_proxy - Win32 Debug"
@@ -242,6 +208,7 @@ DEP_CPP_MOD_P=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\explain.h"\
@@ -259,7 +226,6 @@ DEP_CPP_MOD_P=\
        
 NODEP_CPP_MOD_P=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 
@@ -273,6 +239,7 @@ DEP_CPP_PROXY=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_md5.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
@@ -293,7 +260,6 @@ DEP_CPP_PROXY=\
        
 NODEP_CPP_PROXY=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 
@@ -307,6 +273,7 @@ DEP_CPP_PROXY_=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\explain.h"\
@@ -323,7 +290,6 @@ DEP_CPP_PROXY_=\
        
 NODEP_CPP_PROXY_=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 
@@ -337,6 +303,7 @@ DEP_CPP_PROXY_F=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\explain.h"\
@@ -354,7 +321,6 @@ DEP_CPP_PROXY_F=\
        
 NODEP_CPP_PROXY_F=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 
@@ -368,6 +334,7 @@ DEP_CPP_PROXY_H=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\explain.h"\
@@ -386,7 +353,6 @@ DEP_CPP_PROXY_H=\
        
 NODEP_CPP_PROXY_H=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 
@@ -400,6 +366,7 @@ DEP_CPP_PROXY_U=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_md5.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
@@ -419,7 +386,6 @@ DEP_CPP_PROXY_U=\
        
 NODEP_CPP_PROXY_U=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_rewrite.mak b/src/os/win32/mod_rewrite.mak
index ac80ec1eefd20130e8cf69280c37832fb037252b..e2134cdd0fa3277e1e0c40a9f7f6b602ed5bd238 100644 (file)
--- a/src/os/win32/mod_rewrite.mak
+++ b/src/os/win32/mod_rewrite.mak
@@ -222,6 +222,7 @@ DEP_CPP_MOD_R=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -239,7 +240,6 @@ DEP_CPP_MOD_R=\
        
 NODEP_CPP_MOD_R=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_speling.mak b/src/os/win32/mod_speling.mak
index f94599b3dbb7a1c02c2469a6fa5cb4a3a1faa911..cec439e4e76eaeccf463b873f027a6b33ac701af 100644 (file)
--- a/src/os/win32/mod_speling.mak
+++ b/src/os/win32/mod_speling.mak
@@ -218,6 +218,7 @@ DEP_CPP_MOD_S=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -231,7 +232,6 @@ DEP_CPP_MOD_S=\
        
 NODEP_CPP_MOD_S=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_status.mak b/src/os/win32/mod_status.mak
index 3ccf138fa5e1b9cf6efd5cbf780dd473847ad7f7..de5ff11050336129ee3b7d5808e8654b1be1c526 100644 (file)
--- a/src/os/win32/mod_status.mak
+++ b/src/os/win32/mod_status.mak
@@ -218,6 +218,7 @@ DEP_CPP_MOD_S=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -236,7 +237,6 @@ DEP_CPP_MOD_S=\
        
 NODEP_CPP_MOD_S=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/mod_usertrack.mak b/src/os/win32/mod_usertrack.mak
index cf81e7746336e4de69d3a588a5c5e48ffef8437f..761e7d22e09dab538484da9e47f6759826dd87bc 100644 (file)
--- a/src/os/win32/mod_usertrack.mak
+++ b/src/os/win32/mod_usertrack.mak
@@ -219,6 +219,7 @@ DEP_CPP_MOD_U=\
        "..\..\include\ap_alloc.h"\
        "..\..\include\ap_config.h"\
        "..\..\include\ap_ctype.h"\
+       "..\..\include\ap_ebcdic.h"\
        "..\..\include\ap_mmn.h"\
        "..\..\include\buff.h"\
        "..\..\include\hsregex.h"\
@@ -231,7 +232,6 @@ DEP_CPP_MOD_U=\
        
 NODEP_CPP_MOD_U=\
        "..\..\include\ap_config_auto.h"\
-       "..\..\include\ebcdic.h"\
        "..\..\include\sfio.h"\
        
 

diff --git a/src/os/win32/os.c b/src/os/win32/os.c
index bb49d37cc73189f92355efe675073d5dff80998a..29778df2976fdea7cbc8731d7d9a73866b50ede7 100755 (executable)
--- a/src/os/win32/os.c
+++ b/src/os/win32/os.c
@@ -61,5 +61,268 @@
  * as "__inline" in os.h.
  */
 
+#include <sys/stat.h>
+#include <stdio.h>
+#include <time.h>
 #include "os.h"
 
+/* Win95 doesn't like trailing /s. NT and Unix don't mind. This works 
+ * around the problem.
+ * Errr... except if it is UNC and we are referring to the root of 
+ * the UNC, we MUST have a trailing \ and we can't use /s. Jeez. 
+ * Not sure if this refers to all UNCs or just roots,
+ * but I'm going to fix it for all cases for now. (Ben)
+ */
+
+#undef stat
+API_EXPORT(int) os_stat(const char *szPath, struct stat *pStat)
+{
+    int n;
+    int len = strlen(szPath);
+    
+    if ((len == 0) || (len >= MAX_PATH)) {
+        return -1;
+    }
+
+    if (szPath[0] == '/' && szPath[1] == '/') {
+       char buf[_MAX_PATH];
+       char *s;
+       int nSlashes = 0;
+
+       strcpy(buf, szPath);
+       for (s = buf; *s; ++s) {
+           if (*s == '/') {
+               *s = '\\';
+               ++nSlashes;
+           }
+       }
+       /* then we need to add one more to get \\machine\share\ */
+       if (nSlashes == 3) {
+            if (++len >= MAX_PATH) {
+                return -1;
+            }
+           *s++ = '\\';
+       }
+       *s = '\0';
+       return stat(buf, pStat);
+    }
+
+    /*
+     * Below removes the trailing /, however, do not remove
+     * it in the case of 'x:/' or stat will fail
+     */
+    n = strlen(szPath);
+    if ((szPath[n - 1] == '\\' || szPath[n - 1] == '/') &&
+        !(n == 3 && szPath[1] == ':')) {
+        char buf[MAX_PATH];
+        
+        strcpy(buf, szPath);
+        buf[n - 1] = '\0';
+        
+        return stat(buf, pStat);
+    }
+    return stat(szPath, pStat);
+}
+
+/* Fix two really crap problems with Win32 spawn[lv]e*:
+ *
+ *  1. Win32 doesn't deal with spaces in argv.
+ *  2. Win95 doesn't like / in cmdname.
+ */
+
+#undef _spawnv
+API_EXPORT(int) os_spawnv(int mode, const char *cmdname,
+                         const char *const *argv)
+{
+    int n;
+    char **aszArgs;
+    const char *szArg;
+    char *szCmd;
+    char *s;
+    
+    szCmd = _alloca(strlen(cmdname)+1);
+    strcpy(szCmd, cmdname);
+    for (s = szCmd; *s; ++s) {
+        if (*s == '/') {
+            *s = '\\';
+       }
+    }
+
+    for (n = 0; argv[n]; ++n)
+        ;
+
+    aszArgs = _alloca((n + 1) * sizeof(const char *));
+
+    for (n = 0; szArg = argv[n]; ++n) {
+        if (strchr(szArg, ' ')) {
+            int l = strlen(szArg);
+
+            aszArgs[n] = _alloca(l + 2 + 1);
+            aszArgs[n][0] = '"';
+            strcpy(&aszArgs[n][1], szArg);
+            aszArgs[n][l + 1] = '"';
+            aszArgs[n][l + 2] = '\0';
+        }
+        else {
+            aszArgs[n] = (char *)szArg;
+        }
+    }
+
+    aszArgs[n] = NULL;
+
+    return _spawnv(mode, szCmd, aszArgs);
+}
+
+#undef _spawnve
+API_EXPORT(int) os_spawnve(int mode, const char *cmdname,
+                          const char *const *argv, const char *const *envp)
+{
+    int n;
+    char **aszArgs;
+    const char *szArg;
+    char *szCmd;
+    char *s;
+    
+    szCmd = _alloca(strlen(cmdname)+1);
+    strcpy(szCmd, cmdname);
+    for (s = szCmd; *s; ++s) {
+        if (*s == '/') {
+            *s = '\\';
+       }
+    }
+    
+    for (n = 0; argv[n]; ++n)
+        ;
+
+    aszArgs = _alloca((n + 1)*sizeof(const char *));
+
+    for (n = 0; szArg = argv[n]; ++n){
+        if (strchr(szArg, ' ')) {
+            int l = strlen(szArg);
+
+            aszArgs[n] = _alloca(l + 2 + 1);
+            aszArgs[n][0] = '"';
+            strcpy(&aszArgs[n][1], szArg);
+            aszArgs[n][l + 1] = '"';
+            aszArgs[n][l + 2] = '\0';
+        }
+        else {
+            aszArgs[n] = (char *)szArg;
+        }
+    }
+
+    aszArgs[n] = NULL;
+
+    return _spawnve(mode, szCmd, aszArgs, envp);
+}
+
+API_EXPORT_NONSTD(int) os_spawnle(int mode, const char *cmdname, ...)
+{
+    int n;
+    va_list vlist;
+    char **aszArgs;
+    const char *szArg;
+    const char *const *aszEnv;
+    char *szCmd;
+    char *s;
+    
+    szCmd = _alloca(strlen(cmdname)+1);
+    strcpy(szCmd, cmdname);
+    for (s = szCmd; *s; ++s) {
+        if (*s == '/') {
+            *s = '\\';
+       }
+    }
+
+    va_start(vlist, cmdname);
+    for (n = 0; va_arg(vlist, const char *); ++n)
+        ;
+    va_end(vlist);
+
+    aszArgs = _alloca((n + 1) * sizeof(const char *));
+
+    va_start(vlist, cmdname);
+    for (n = 0; szArg = va_arg(vlist, const char *); ++n) {
+        if (strchr(szArg, ' ')) {
+            int l = strlen(szArg);
+
+            aszArgs[n] = _alloca(l + 2 + 1);
+            aszArgs[n][0] = '"';
+            strcpy(&aszArgs[n][1], szArg);
+            aszArgs[n][l + 1] = '"';
+            aszArgs[n][l + 2] = '\0';
+        }
+        else {
+            aszArgs[n] = (char *)szArg;
+        }
+    }
+
+    aszArgs[n] = NULL;
+
+    aszEnv = va_arg(vlist, const char *const *);
+    va_end(vlist);
+    
+    return _spawnve(mode, szCmd, aszArgs, aszEnv);
+}
+
+#undef strftime
+
+/* Partial replacement for strftime. This adds certain expandos to the
+ * Windows version
+ */
+
+API_EXPORT(int) os_strftime(char *s, size_t max, const char *format,
+                            const struct tm *tm) {
+   /* If the new format string is bigger than max, the result string probably
+    * won't fit anyway. When %-expandos are added, made sure the padding below
+    * is enough.
+    */
+    char *new_format = (char *) _alloca(max + 11);
+    size_t i, j, format_length = strlen(format);
+    int return_value;
+    int length_written;
+
+    for (i = 0, j = 0; (i < format_length && j < max);) {
+        if (format[i] != '%') {
+            new_format[j++] = format[i++];
+            continue;
+        }
+        switch (format[i+1]) {
+            case 'D':
+                /* Is this locale dependent? Shouldn't be...
+                   Also note the year 2000 exposure here */
+                memcpy(new_format + j, "%m/%d/%y", 8);
+                i += 2;
+                j += 8;
+                break;
+            case 'r':
+                memcpy(new_format + j, "%I:%M:%S %p", 11);
+                i += 2;
+                j += 11;
+                break;
+            case 'T':
+                memcpy(new_format + j, "%H:%M:%S", 8);
+                i += 2;
+                j += 8;
+                break;
+            case 'e':
+                length_written = _snprintf(new_format + j, max - j, "%2d",
+                    tm->tm_mday);
+                j = (length_written == -1) ? max : (j + length_written);
+                i += 2;
+                break;
+            default:
+                /* We know we can advance two characters forward here. */
+                new_format[j++] = format[i++];
+                new_format[j++] = format[i++];
+        }
+    }
+    if (j >= max) {
+        *s = '\0';  /* Defensive programming, okay since output is undefined */
+        return_value = 0;
+    } else {
+        new_format[j] = '\0';
+        return_value = strftime(s, max, new_format, tm);
+    }
+    return return_value;
+}

diff --git a/src/os/win32/util_win32.c b/src/os/win32/util_win32.c
index 14b3ec4bcf3346454b8743216f2d36972dd2b380..591fccfee8d97ceac783164f405b16f60548bd5f 100644 (file)
--- a/src/os/win32/util_win32.c
+++ b/src/os/win32/util_win32.c
@@ -58,7 +58,6 @@
 
 #ifdef WIN32
 
-#include <windows.h>
 #include <sys/stat.h>
 #include <stdarg.h>
 #include <time.h>
@@ -358,267 +357,6 @@ API_EXPORT(char *) ap_os_canonical_filename(pool *pPool, const char *szFile)
     return pNewName;
 }
 
-/* Win95 doesn't like trailing /s. NT and Unix don't mind. This works 
- * around the problem.
- * Errr... except if it is UNC and we are referring to the root of 
- * the UNC, we MUST have a trailing \ and we can't use /s. Jeez. 
- * Not sure if this refers to all UNCs or just roots,
- * but I'm going to fix it for all cases for now. (Ben)
- */
-
-#undef stat
-API_EXPORT(int) os_stat(const char *szPath, struct stat *pStat)
-{
-    int n;
-    int len = strlen(szPath);
-    
-    if ((len == 0) || (len >= MAX_PATH)) {
-        return -1;
-    }
-
-    if (szPath[0] == '/' && szPath[1] == '/') {
-       char buf[_MAX_PATH];
-       char *s;
-       int nSlashes = 0;
-
-       strcpy(buf, szPath);
-       for (s = buf; *s; ++s) {
-           if (*s == '/') {
-               *s = '\\';
-               ++nSlashes;
-           }
-       }
-       /* then we need to add one more to get \\machine\share\ */
-       if (nSlashes == 3) {
-            if (++len >= MAX_PATH) {
-                return -1;
-            }
-           *s++ = '\\';
-       }
-       *s = '\0';
-       return stat(buf, pStat);
-    }
-
-    /*
-     * Below removes the trailing /, however, do not remove
-     * it in the case of 'x:/' or stat will fail
-     */
-    n = strlen(szPath);
-    if ((szPath[n - 1] == '\\' || szPath[n - 1] == '/') &&
-        !(n == 3 && szPath[1] == ':')) {
-        char buf[_MAX_PATH];
-        
-        ap_assert(n < _MAX_PATH);
-        strcpy(buf, szPath);
-        buf[n - 1] = '\0';
-        
-        return stat(buf, pStat);
-    }
-    return stat(szPath, pStat);
-}
-
-/* Fix two really crap problems with Win32 spawn[lv]e*:
- *
- *  1. Win32 doesn't deal with spaces in argv.
- *  2. Win95 doesn't like / in cmdname.
- */
-
-#undef _spawnv
-API_EXPORT(int) os_spawnv(int mode, const char *cmdname,
-                         const char *const *argv)
-{
-    int n;
-    char **aszArgs;
-    const char *szArg;
-    char *szCmd;
-    char *s;
-    
-    szCmd = _alloca(strlen(cmdname)+1);
-    strcpy(szCmd, cmdname);
-    for (s = szCmd; *s; ++s) {
-        if (*s == '/') {
-            *s = '\\';
-       }
-    }
-
-    for (n = 0; argv[n]; ++n)
-        ;
-
-    aszArgs = _alloca((n + 1) * sizeof(const char *));
-
-    for (n = 0; szArg = argv[n]; ++n) {
-        if (strchr(szArg, ' ')) {
-            int l = strlen(szArg);
-
-            aszArgs[n] = _alloca(l + 2 + 1);
-            aszArgs[n][0] = '"';
-            strcpy(&aszArgs[n][1], szArg);
-            aszArgs[n][l + 1] = '"';
-            aszArgs[n][l + 2] = '\0';
-        }
-        else {
-            aszArgs[n] = (char *)szArg;
-        }
-    }
-
-    aszArgs[n] = NULL;
-
-    return _spawnv(mode, szCmd, aszArgs);
-}
-
-#undef _spawnve
-API_EXPORT(int) os_spawnve(int mode, const char *cmdname,
-                          const char *const *argv, const char *const *envp)
-{
-    int n;
-    char **aszArgs;
-    const char *szArg;
-    char *szCmd;
-    char *s;
-    
-    szCmd = _alloca(strlen(cmdname)+1);
-    strcpy(szCmd, cmdname);
-    for (s = szCmd; *s; ++s) {
-        if (*s == '/') {
-            *s = '\\';
-       }
-    }
-    
-    for (n = 0; argv[n]; ++n)
-        ;
-
-    aszArgs = _alloca((n + 1)*sizeof(const char *));
-
-    for (n = 0; szArg = argv[n]; ++n){
-        if (strchr(szArg, ' ')) {
-            int l = strlen(szArg);
-
-            aszArgs[n] = _alloca(l + 2 + 1);
-            aszArgs[n][0] = '"';
-            strcpy(&aszArgs[n][1], szArg);
-            aszArgs[n][l + 1] = '"';
-            aszArgs[n][l + 2] = '\0';
-        }
-        else {
-            aszArgs[n] = (char *)szArg;
-        }
-    }
-
-    aszArgs[n] = NULL;
-
-    return _spawnve(mode, szCmd, aszArgs, envp);
-}
-
-API_EXPORT_NONSTD(int) os_spawnle(int mode, const char *cmdname, ...)
-{
-    int n;
-    va_list vlist;
-    char **aszArgs;
-    const char *szArg;
-    const char *const *aszEnv;
-    char *szCmd;
-    char *s;
-    
-    szCmd = _alloca(strlen(cmdname)+1);
-    strcpy(szCmd, cmdname);
-    for (s = szCmd; *s; ++s) {
-        if (*s == '/') {
-            *s = '\\';
-       }
-    }
-
-    va_start(vlist, cmdname);
-    for (n = 0; va_arg(vlist, const char *); ++n)
-        ;
-    va_end(vlist);
-
-    aszArgs = _alloca((n + 1) * sizeof(const char *));
-
-    va_start(vlist, cmdname);
-    for (n = 0; szArg = va_arg(vlist, const char *); ++n) {
-        if (strchr(szArg, ' ')) {
-            int l = strlen(szArg);
-
-            aszArgs[n] = _alloca(l + 2 + 1);
-            aszArgs[n][0] = '"';
-            strcpy(&aszArgs[n][1], szArg);
-            aszArgs[n][l + 1] = '"';
-            aszArgs[n][l + 2] = '\0';
-        }
-        else {
-            aszArgs[n] = (char *)szArg;
-        }
-    }
-
-    aszArgs[n] = NULL;
-
-    aszEnv = va_arg(vlist, const char *const *);
-    va_end(vlist);
-    
-    return _spawnve(mode, szCmd, aszArgs, aszEnv);
-}
-
-#undef strftime
-
-/* Partial replacement for strftime. This adds certain expandos to the
- * Windows version
- */
-
-API_EXPORT(int) os_strftime(char *s, size_t max, const char *format,
-                            const struct tm *tm) {
-   /* If the new format string is bigger than max, the result string probably
-    * won't fit anyway. When %-expandos are added, made sure the padding below
-    * is enough.
-    */
-    char *new_format = (char *) _alloca(max + 11);
-    size_t i, j, format_length = strlen(format);
-    int return_value;
-    int length_written;
-
-    for (i = 0, j = 0; (i < format_length && j < max);) {
-        if (format[i] != '%') {
-            new_format[j++] = format[i++];
-            continue;
-        }
-        switch (format[i+1]) {
-            case 'D':
-                /* Is this locale dependent? Shouldn't be...
-                   Also note the year 2000 exposure here */
-                memcpy(new_format + j, "%m/%d/%y", 8);
-                i += 2;
-                j += 8;
-                break;
-            case 'r':
-                memcpy(new_format + j, "%I:%M:%S %p", 11);
-                i += 2;
-                j += 11;
-                break;
-            case 'T':
-                memcpy(new_format + j, "%H:%M:%S", 8);
-                i += 2;
-                j += 8;
-                break;
-            case 'e':
-                length_written = ap_snprintf(new_format + j, max - j, "%2d",
-                    tm->tm_mday);
-                j = (length_written == -1) ? max : (j + length_written);
-                i += 2;
-                break;
-            default:
-                /* We know we can advance two characters forward here. */
-                new_format[j++] = format[i++];
-                new_format[j++] = format[i++];
-        }
-    }
-    if (j >= max) {
-        *s = '\0';  /* Defensive programming, okay since output is undefined */
-        return_value = 0;
-    } else {
-        new_format[j] = '\0';
-        return_value = strftime(s, max, new_format, tm);
-    }
-    return return_value;
-}
 
 /*
  * ap_os_is_filename_valid is given a filename, and returns 0 if the filename

diff --git a/src/support/htdigest.mak b/src/support/htdigest.mak
index a04c8124dccc55cab836e76e6edbb96fd0c288aa..e2a53ad44d8e30e24e82fc46c42840f7b7fb6369 100644 (file)
--- a/src/support/htdigest.mak
+++ b/src/support/htdigest.mak
@@ -180,6 +180,7 @@ DEP_CPP_AP_CP=\
        "..\include\ap_alloc.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\buff.h"\
        "..\include\hsregex.h"\
@@ -190,7 +191,6 @@ DEP_CPP_AP_CP=\
        
 NODEP_CPP_AP_CP=\
        "..\include\ap_config_auto.h"\
-       "..\include\ebcdic.h"\
        "..\include\sfio.h"\
        
 
@@ -220,13 +220,13 @@ DEP_CPP_AP_MD=\
        "..\include\ap.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_md5.h"\
        "..\include\ap_mmn.h"\
        "..\include\hsregex.h"\
        "..\os\win32\os.h"\
        
 NODEP_CPP_AP_MD=\
-       "..\ap\ebcdic.h"\
        "..\include\ap_config_auto.h"\
        
 

diff --git a/src/support/htpasswd.mak b/src/support/htpasswd.mak
index 13f9cf442d31bc283b3c30e4660408dbd0a90c5e..796d819ff4142f40e7d37806a0ba5fe4a1051a33 100644 (file)
--- a/src/support/htpasswd.mak
+++ b/src/support/htpasswd.mak
@@ -195,12 +195,12 @@ DEP_CPP_AP_BA=\
        "..\include\ap.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\hsregex.h"\
        "..\os\win32\os.h"\
        
 NODEP_CPP_AP_BA=\
-       "..\ap\ebcdic.h"\
        "..\include\ap_config_auto.h"\
        
 
@@ -233,6 +233,7 @@ DEP_CPP_AP_CP=\
        "..\include\ap_alloc.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\buff.h"\
        "..\include\hsregex.h"\
@@ -243,7 +244,6 @@ DEP_CPP_AP_CP=\
        
 NODEP_CPP_AP_CP=\
        "..\include\ap_config_auto.h"\
-       "..\include\ebcdic.h"\
        "..\include\sfio.h"\
        
 
@@ -273,13 +273,13 @@ DEP_CPP_AP_MD=\
        "..\include\ap.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_md5.h"\
        "..\include\ap_mmn.h"\
        "..\include\hsregex.h"\
        "..\os\win32\os.h"\
        
 NODEP_CPP_AP_MD=\
-       "..\ap\ebcdic.h"\
        "..\include\ap_config_auto.h"\
        
 
@@ -292,13 +292,13 @@ DEP_CPP_AP_SH=\
        "..\include\ap.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\ap_sha1.h"\
        "..\include\hsregex.h"\
        "..\os\win32\os.h"\
        
 NODEP_CPP_AP_SH=\
-       "..\ap\ebcdic.h"\
        "..\include\ap_config_auto.h"\
        
 
@@ -312,6 +312,7 @@ DEP_CPP_AP_SN=\
        "..\include\ap_alloc.h"\
        "..\include\ap_config.h"\
        "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
        "..\include\ap_mmn.h"\
        "..\include\buff.h"\
        "..\include\hsregex.h"\
@@ -322,7 +323,6 @@ DEP_CPP_AP_SN=\
        
 NODEP_CPP_AP_SN=\
        "..\include\ap_config_auto.h"\
-       "..\include\ebcdic.h"\
        "..\include\sfio.h"\
        
 

diff --git a/src/support/rotatelogs.dsp b/src/support/rotatelogs.dsp
index 7e4182228b712594d35084892d92e26b487326a9..55a2c299f38fb9971791dec204b55b5b2e93873c 100644 (file)
--- a/src/support/rotatelogs.dsp
+++ b/src/support/rotatelogs.dsp
@@ -49,8 +49,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:console /incremental:no /map /machine:I386
-# ADD LINK32 /nologo /subsystem:console /incremental:no /map /machine:I386
+# ADD BASE LINK32 /nologo /subsystem:console /map /machine:I386
+# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /map /machine:I386
 
 !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
 
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:console /incremental:no /map /debug /machine:I386
-# ADD LINK32 /nologo /subsystem:console /incremental:no /map /debug /machine:I386
+# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386
 
 !ENDIF 
 
@@ -84,6 +84,18 @@ LINK32=link.exe
 # Name "rotatelogs - Win32 Debug"
 # Begin Source File
 
+SOURCE=..\ap\ap_cpystrn.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ap\ap_snprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\os\win32\os.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\rotatelogs.c
 # End Source File
 # End Target

diff --git a/src/support/rotatelogs.mak b/src/support/rotatelogs.mak
index 2aca574cf9cf55b4ff4703f730a1df61dd8eae3f..dfcd590176b94c35c4aef8ee04144d71683adb54 100644 (file)
--- a/src/support/rotatelogs.mak
+++ b/src/support/rotatelogs.mak
@@ -50,6 +50,9 @@ ALL : "$(OUTDIR)\rotatelogs.exe"
 !ENDIF 
 
 CLEAN :
+       -@erase "$(INTDIR)\ap_cpystrn.obj"
+       -@erase "$(INTDIR)\ap_snprintf.obj"
+       -@erase "$(INTDIR)\os.obj"
        -@erase "$(INTDIR)\rotatelogs.idb"
        -@erase "$(INTDIR)\rotatelogs.obj"
        -@erase "$(OUTDIR)\rotatelogs.exe"
@@ -68,10 +71,13 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map" /machine:I386\
- /out:"$(OUTDIR)\rotatelogs.exe" 
+LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:console\
+ /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map"\
+ /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" 
 LINK32_OBJS= \
+       "$(INTDIR)\ap_cpystrn.obj" \
+       "$(INTDIR)\ap_snprintf.obj" \
+       "$(INTDIR)\os.obj" \
        "$(INTDIR)\rotatelogs.obj"
 
 "$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -98,6 +104,9 @@ ALL : "$(OUTDIR)\rotatelogs.exe"
 !ENDIF 
 
 CLEAN :
+       -@erase "$(INTDIR)\ap_cpystrn.obj"
+       -@erase "$(INTDIR)\ap_snprintf.obj"
+       -@erase "$(INTDIR)\os.obj"
        -@erase "$(INTDIR)\rotatelogs.idb"
        -@erase "$(INTDIR)\rotatelogs.obj"
        -@erase "$(OUTDIR)\rotatelogs.exe"
@@ -117,10 +126,13 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc"
 BSC32_SBRS= \
        
 LINK32=link.exe
-LINK32_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map" /debug\
- /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" 
+LINK32_FLAGS=kernel32.lib wsock32.lib /nologo /subsystem:console\
+ /incremental:no /pdb:"$(OUTDIR)\rotatelogs.pdb" /map:"$(INTDIR)\rotatelogs.map"\
+ /debug /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe" 
 LINK32_OBJS= \
+       "$(INTDIR)\ap_cpystrn.obj" \
+       "$(INTDIR)\ap_snprintf.obj" \
+       "$(INTDIR)\os.obj" \
        "$(INTDIR)\rotatelogs.obj"
 
 "$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -163,6 +175,63 @@ LINK32_OBJS= \
 
 !IF "$(CFG)" == "rotatelogs - Win32 Release" || "$(CFG)" ==\
  "rotatelogs - Win32 Debug"
+SOURCE=..\ap\ap_cpystrn.c
+DEP_CPP_AP_CP=\
+       "..\include\ap.h"\
+       "..\include\ap_alloc.h"\
+       "..\include\ap_config.h"\
+       "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
+       "..\include\ap_mmn.h"\
+       "..\include\buff.h"\
+       "..\include\hsregex.h"\
+       "..\include\httpd.h"\
+       "..\include\util_uri.h"\
+       "..\os\win32\os.h"\
+       "..\os\win32\readdir.h"\
+       
+NODEP_CPP_AP_CP=\
+       "..\include\ap_config_auto.h"\
+       "..\include\sfio.h"\
+       
+
+"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\ap\ap_snprintf.c
+DEP_CPP_AP_SN=\
+       "..\include\ap.h"\
+       "..\include\ap_alloc.h"\
+       "..\include\ap_config.h"\
+       "..\include\ap_ctype.h"\
+       "..\include\ap_ebcdic.h"\
+       "..\include\ap_mmn.h"\
+       "..\include\buff.h"\
+       "..\include\hsregex.h"\
+       "..\include\httpd.h"\
+       "..\include\util_uri.h"\
+       "..\os\win32\os.h"\
+       "..\os\win32\readdir.h"\
+       
+NODEP_CPP_AP_SN=\
+       "..\include\ap_config_auto.h"\
+       "..\include\sfio.h"\
+       
+
+"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\os\win32\os.c
+DEP_CPP_OS_C4=\
+       "..\os\win32\os.h"\
+       
+
+"$(INTDIR)\os.obj" : $(SOURCE) $(DEP_CPP_OS_C4) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\rotatelogs.c
 DEP_CPP_ROTAT=\
        "..\include\ap_config.h"\