TPF-specific changes to two sample files and mod_proxy.h.

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

diff --git a/src/modules/proxy/mod_proxy.h b/src/modules/proxy/mod_proxy.h
index a3fea0ce40a3dfacf68f59d7bb6b8e3032fc6d11..e185ceabc6e151a8464c09299b4f63c2f1c662d4 100644 (file)
--- a/src/modules/proxy/mod_proxy.h
+++ b/src/modules/proxy/mod_proxy.h
@@ -213,8 +213,8 @@ typedef struct {
 
 struct per_thread_data {
     struct hostent hpbuf;
-#ifdef TPF
-    u_int  ipaddr;
+#ifdef TPF64BIT
+    in_addr_t ipaddr;
 #else
     u_long ipaddr;
 #endif

diff --git a/src/os/tpf/samples/sample_env.txt b/src/os/tpf/samples/sample_env.txt
index f3db0c9b34a96de140c8e36ee696ff759c3f1db0..4a4526a1060e89cae0ab696cd3b8303728e8d7d0 100644 (file)
--- a/src/os/tpf/samples/sample_env.txt
+++ b/src/os/tpf/samples/sample_env.txt
@@ -3,49 +3,49 @@
 #######################################################################
 # Define the directories where the shared objects reside              #
 #######################################################################
-ROOTLIBDIRS := $(foreach d,$(TPF_ROOT),$d/your_path/apache/lib)
+ROOTLIBDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/apache/lib)
 
 #######################################################################
 # Define directories where the loadables (XXXXVV) are to be written   #
 #######################################################################
-ROOTLOADDIRS := $(foreach d,$(TPF_ROOT),$d/your_path/load)
+ROOTLOADDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/load)
 
 #######################################################################
 # Define location of the export files used by the LD postprocessor    #
 # The .exp files will live in lib directory                           #
 #######################################################################
-ROOTEXPDIRS := $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/exp)
+ROOTEXPDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/exp)
 
 #######################################################################
 # Define the object file directory name                               #
 #######################################################################
-ROOTOBJDIRS := $(foreach d,$(TPF_ROOT),$d/your_path/apache/obj)
+ROOTOBJDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/apache/obj)
 
 #######################################################################
 # Define the listing files directory name                             #
 #######################################################################
-ROOTLSTDIRS := $(foreach d,$(TPF_ROOT),$d/your_path/apache/lst)
+ROOTLSTDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/apache/lst)
 
 #######################################################################
 # Set the include/header file directories                             #
 #######################################################################
-ROOTINCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/include)
-ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/modules/proxy)
-ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/modules/standard)
-ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/os/tpf)
-ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/regex)
+ROOTINCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/include)
+ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/modules/proxy)
+ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/modules/standard)
+ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/os/tpf)
+ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/regex)
 
 #######################################################################
 # Set the C file directories                                          #
 #######################################################################
-ROOTCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/ap)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/main)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/modules/example)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/modules/extra)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/modules/experimental)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/modules/proxy)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/modules/standard)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/os/tpf)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/regex)
-ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/your_path/apache/src/support)
+ROOTCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/ap)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/main)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/modules/example)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/modules/extra)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/modules/experimental)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/modules/proxy)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/modules/standard)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/os/tpf)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/regex)
+ROOTCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/apache/src/support)

diff --git a/src/os/tpf/samples/sample_mak.txt b/src/os/tpf/samples/sample_mak.txt
index fe62c80c66bbefae20480bec71bb10e092c03885..7fdaa38c0605666ae6b2957ecc849916c3afec73 100644 (file)
--- a/src/os/tpf/samples/sample_mak.txt
+++ b/src/os/tpf/samples/sample_mak.txt
@@ -60,7 +60,7 @@ C_SRC += util_uri.c
 C_SRC += os.c
 C_SRC += os-inline.c
 
-APACHE_MODULE_FILE := $(word 1,$(foreach d,$(TPF_ROOT),$(wildcard $d/your_path/apache/src/apache.modules)))
+APACHE_MODULE_FILE := $(word 1,$(foreach d,$(TPF_ROOT),$(wildcard $d/opensource/apache/src/apache.modules)))
 ifeq ("$(APACHE_MODULE_FILE)","")
 $(error $(MTPF0045E))
 endif