coar98/01/21 10:24:03
Modified:src CHANGES
src/ap ap.h
src/main alloc.h buff.h conf.h http_conf_globals.h
http_config.h http_core.h http_log.h http_main.h
http_protocol.h http_request.h http_vhost.h httpd.h
md5.h multithread.h rfc1413.h scoreboard.h
util_date.h util_md5.h util_script.h
Log:
Add #ifndef wrappers to src/main/*.h files to insulate them
against multiple inclusions. httpd.h now includes ap.h for
the ap_*() routines.
Reviewed by: Commit-then-review rules
Revision ChangesPath
1.572 +8 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- CHANGES 1998/01/20 18:56:51 1.571
+++ CHANGES 1998/01/21 18:23:42 1.572
@@ -1,5 +1,13 @@
Changes with Apache 1.3b4
+ *) The src/main/*.h header files have had #ifndef wrappers added to
+ insulate them against duplicate calls if they get included through
+ multiple paths (e.g., in .c files as well as other .h files).
+ [Ken Coar]
+
+ *) The libap routines now have a header file for their prototypes,
+ src/ap/ap.h, to ease their use in non-httpd applications. [Ken Coar]
+
*) mod_autoindex with a plaintext header file would emit the PRE
start-tag before the HTML preamble, rather than after the preamble
but before the header file contents. [John Van Essen [EMAIL
PROTECTED]]
1.2 +3 -3 apachen/src/ap/ap.h
Index: ap.h
===
RCS file: /export/home/cvs/apachen/src/ap/ap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap.h 1998/01/21 17:12:40 1.1
+++ ap.h 1998/01/21 18:23:46 1.2
@@ -54,8 +54,8 @@
* [EMAIL PROTECTED] for xinetd.
*/
-#ifndef _AP_H
-#define _AP_H
+#ifndef _APACHE_AP_H
+#define _APACHE_AP_H
API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t);
int ap_slack(int, int);
@@ -63,4 +63,4 @@
API_EXPORT(int) ap_snprintf(char *, size_t, const char *, ...);
API_EXPORT(int) ap_vsnprintf(char *, size_t, const char *, va_list ap);
-#endif
+#endif /* !_APACHE_AP_H */
1.39 +5 -0 apachen/src/main/alloc.h
Index: alloc.h
===
RCS file: /export/home/cvs/apachen/src/main/alloc.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- alloc.h 1998/01/07 16:45:59 1.38
+++ alloc.h 1998/01/21 18:23:47 1.39
@@ -52,6 +52,9 @@
*
*/
+#ifndef _APACHE_ALLOC_H
+#define _APACHE_ALLOC_H
+
/*
* Resource allocation routines...
*
@@ -276,3 +279,5 @@
API_EXPORT(long) bytes_in_pool(pool *p);
API_EXPORT(long) bytes_in_free_blocks(void);
+
+#endif /* !_APACHE_ALLOC_H */
1.31 +5 -0 apachen/src/main/buff.h
Index: buff.h
===
RCS file: /export/home/cvs/apachen/src/main/buff.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- buff.h1998/01/16 14:22:54 1.30
+++ buff.h1998/01/21 18:23:47 1.31
@@ -51,6 +51,9 @@
*
*/
+#ifndef _APACHE_BUFF_H
+#define _APACHE_BUFF_H
+
#ifdef B_SFIO
#include sfio.h
#endif
@@ -189,3 +192,5 @@
/* bflush() if a read now would block, but don't actually read anything */
API_EXPORT(void) bhalfduplex(BUFF *fb);
+
+#endif /* !_APACHE_BUFF_H */
1.167 +5 -0 apachen/src/main/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- conf.h1998/01/13 23:11:08 1.166
+++ conf.h1998/01/21 18:23:48 1.167
@@ -51,6 +51,9 @@
*
*/
+#ifndef _APACHE_CONF_H
+#define _APACHE_CONF_H
+
/*
* conf.h: system-dependant #defines and includes...
* See README for a listing of what they mean
@@ -1047,3 +1050,5 @@
#ifdef NEED_DIFFTIME
extern double difftime(time_t time1, time_t time0);
#endif
+
+#endif /* !_APACHE_CONF_H */
1.23 +5 -0 apachen/src/main/http_conf_globals.h
Index: http_conf_globals.h
===
RCS file: /export/home/cvs/apachen/src/main/http_conf_globals.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- http_conf_globals.h 1998/01/11 20:25:01
