Cleanup a few things with the compile. There were also a few macro name

changes I missed earlier.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84496 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/util_date.h b/include/util_date.h
index 2f892bb261cde504c9ea5ad1578c72351b434c27..88c9155a38ad1d483b9f0f3a363b396da181efbb 100644 (file)
--- a/include/util_date.h
+++ b/include/util_date.h
@@ -67,17 +67,8 @@ extern "C" {
  */
 
 #include "apr_time.h"
-/* XXX - This section lists include files for OS-specific types that APR
- * should replace. Once they are replaced, this section should be
- * removed */
-#ifndef NO_MORE_OS_TYPES_IN_THIS_FILE
-#include "ap_config_auto.h"
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#endif /* NO_MORE_OS_TYPES_IN_THIS_FILE */
 
-#define BAD_DATE (time_t)0
+#define BAD_DATE (ap_time_t)0
 
 API_EXPORT(int) ap_checkmask(const char *data, const char *mask);
 API_EXPORT(ap_time_t) ap_parseHTTPdate(const char *date);

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 393c2a14682e907a9e071dc7caccb70b17602030..4849f77540012831c8e30a05bf058402262a7f00 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2060,13 +2060,13 @@ API_EXPORT(const char *) ap_psignature(const char *prefix, request_rec *r)
     ap_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r));
 
     if (conf->server_signature == srv_sig_withmail) {
-       return ap_pstrcat(r->pool, prefix, "<ADDRESS>" SERVER_BASEVERSION
+       return ap_pstrcat(r->pool, prefix, "<ADDRESS>" AP_SERVER_BASEVERSION
                          " Server at <A HREF=\"mailto:",
                          r->server->server_admin, "\">",
                          ap_get_server_name(r), "</A> Port ", sport,
                          "</ADDRESS>\n", NULL);
     }
-    return ap_pstrcat(r->pool, prefix, "<ADDRESS>" SERVER_BASEVERSION
+    return ap_pstrcat(r->pool, prefix, "<ADDRESS>" AP_SERVER_BASEVERSION
                      " Server at ", ap_get_server_name(r), " Port ", sport,
                      "</ADDRESS>\n", NULL);
 }

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 5f622879f1097d3e412134dac3f9926953e05d3a..9f10c24aadccf4a7a2db38b644f7ee27b86f05c9 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1332,7 +1332,7 @@ API_EXPORT(void) ap_basic_http_header(request_rec *r)
         r->connection->keepalive = -1;
     }
     else
-        protocol = SERVER_PROTOCOL;
+        protocol = AP_SERVER_PROTOCOL;
 
 #ifdef CHARSET_EBCDIC
     ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, 1);
@@ -1775,7 +1775,7 @@ API_EXPORT(int) ap_should_client_block(request_rec *r)
 
     if (r->expecting_100 && r->proto_num >= HTTP_VERSION(1,1)) {
         /* sending 100 Continue interim response */
-        ap_rvputs(r, SERVER_PROTOCOL, " ", status_lines[0], "\015\012\015\012",
+        ap_rvputs(r, AP_SERVER_PROTOCOL, " ", status_lines[0], "\015\012\015\012",
                   NULL);
         ap_rflush(r);
     }