rbb 00/01/28 10:02:32
Modified:src/ap ap_hooks.c ap_sha1.c
src/helpers build-modules-c.awk
src/main buff.c gen_test_char.c http_config.c
http_connection.c http_core.c http_main.c
http_protocol.c http_request.c http_vhost.c
iol_file.c listen.c rfc1413.c util.c util_md5.c
util_script.c util_uri.c
src/modules/mpm/prefork prefork.c
src/modules/standard mod_actions.c mod_alias.c mod_asis.c
mod_auth.c mod_dir.c mod_echo.c mod_setenvif.c
src/os/unix iol_socket.c unixd.c
Log:
Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is
defined correctly in all C files.
Revision ChangesPath
1.10 +1 -0 apache-2.0/src/ap/ap_hooks.c
Index: ap_hooks.c
===
RCS file: /home/cvs/apache-2.0/src/ap/ap_hooks.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ap_hooks.c2000/01/19 01:14:22 1.9
+++ ap_hooks.c2000/01/28 18:00:33 1.10
@@ -1,3 +1,4 @@
+#include ap_config.h
#include httpd.h
#include ap_hooks.h
#include assert.h
1.4 +1 -1 apache-2.0/src/ap/ap_sha1.c
Index: ap_sha1.c
===
RCS file: /home/cvs/apache-2.0/src/ap/ap_sha1.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ap_sha1.c 2000/01/19 01:14:22 1.3
+++ ap_sha1.c 2000/01/28 18:00:35 1.4
@@ -84,13 +84,13 @@
#include string.h
+#include ap_config.h
#include httpd.h
#include ap_sha1.h
#include ap.h
#ifdef CHARSET_EBCDIC
#include ebcdic.h
#endif /*CHARSET_EBCDIC*/
-#include ap_config.h
/* a bit faster bigger, if defined */
#define UNROLL_LOOPS
1.3 +1 -0 apache-2.0/src/helpers/build-modules-c.awk
Index: build-modules-c.awk
===
RCS file: /home/cvs/apache-2.0/src/helpers/build-modules-c.awk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-modules-c.awk 1999/12/19 16:36:49 1.2
+++ build-modules-c.awk 2000/01/28 18:00:46 1.3
@@ -17,6 +17,7 @@
print * configuration script. DO NOT HAND EDIT!
print */
print
+print #include \ap_config.h\
print #include \httpd.h\
print #include \http_config.h\
print
1.29 +1 -1 apache-2.0/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- buff.c2000/01/23 16:37:39 1.28
+++ buff.c2000/01/28 18:00:58 1.29
@@ -55,10 +55,10 @@
*
*/
+#include ap_config.h
#include httpd.h
#include http_main.h
#include http_log.h
-#include ap_config.h
#include stdio.h
#include stdarg.h
1.2 +1 -0 apache-2.0/src/main/gen_test_char.c
Index: gen_test_char.c
===
RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gen_test_char.c 1999/08/24 06:45:18 1.1
+++ gen_test_char.c 2000/01/28 18:01:04 1.2
@@ -1,4 +1,5 @@
/* we need some of the portability definitions... for strchr */
+#include ap_config.h
#include httpd.h
/* A bunch of functions in util.c scan strings looking for certain
characters.
1.24 +1 -1 apache-2.0/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- http_config.c 2000/01/19 01:15:02 1.23
+++ http_config.c 2000/01/28 18:01:06 1.24
@@ -72,6 +72,7 @@
#define CORE_PRIVATE
+#include ap_config.h
#include apr_portable.h
#include apr_file_io.h
#include httpd.h
@@ -81,7 +82,6 @@
#include http_request.h/* for default_handler (see invoke_handler) */
#include http_main.h
#include http_vhost.h
-#include ap_config.h
HOOK_STRUCT(
HOOK_LINK(header_parser)
1.26 +1 -1 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- http_connection.c 2000/01/19 01:15:03 1.25
+++