You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/06/13 01:03:07 UTC
cvs commit: apache-2.0/src/support ab.c logresolve.c rotatelogs.c
rbb 00/06/12 16:03:06
Modified: src/ap ap_cache.c
src/main buff.c http_connection.c http_core.c http_log.c
http_protocol.c http_vhost.c listen.c rfc1413.c
util.c util_date.c util_script.c util_uri.c
src/modules/experimental mod_charset_lite.c
mod_mmap_static.c
src/modules/mpm/dexter dexter.c scoreboard.c
src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.c
src/modules/mpm/prefork prefork.c
src/modules/standard mod_cgid.c mod_file_cache.c
mod_include.c mod_log_config.c mod_mime_magic.c
mod_rewrite.h mod_unique_id.c
src/os/unix iol_socket.c os-inline.c unixd.c unixd.h
src/support ab.c logresolve.c rotatelogs.c
Log:
Protect system header files with the appropriate macros.
Revision Changes Path
1.2 +2 -0 apache-2.0/src/ap/ap_cache.c
Index: ap_cache.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap_cache.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap_cache.c 2000/06/12 20:41:13 1.1
+++ ap_cache.c 2000/06/12 23:02:47 1.2
@@ -1,7 +1,9 @@
#include "ap_cache.h"
#include "httpd.h"
#include "http_log.h"
+#ifdef HAVE_STDIO_H
#include <stdio.h>
+#endif
/* struct ap_cache_handle_t, some function pointer in the meth */
#define VERIFY_IMPL(x, fun) if(!x || !x->meth.fun) return APR_ENOTIMPL
1.50 +8 -0 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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- buff.c 2000/06/10 02:06:01 1.49
+++ buff.c 2000/06/12 23:02:48 1.50
@@ -62,10 +62,18 @@
#include "http_log.h"
#include "util_ebcdic.h"
+#ifdef HAVE_STDIO_H
#include <stdio.h>
+#endif
+#ifdef HAVE_STDARG_H
#include <stdarg.h>
+#endif
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
#ifdef HAVE_BSTRING_H
#include <bstring.h> /* for IRIX, FD_SET calls bzero() */
1.38 +4 -0 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- http_connection.c 2000/06/12 21:46:36 1.37
+++ http_connection.c 2000/06/12 23:02:48 1.38
@@ -67,8 +67,12 @@
#include "http_config.h"
#include "http_vhost.h"
+#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
+#endif
AP_HOOK_STRUCT(
AP_HOOK_LINK(pre_connection)
1.72 +2 -0 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- http_core.c 2000/06/12 21:46:36 1.71
+++ http_core.c 2000/06/12 23:02:49 1.72
@@ -73,7 +73,9 @@
#include "http_connection.h"
#include "util_ebcdic.h"
#include "mpm.h"
+#ifdef HAVE_NETDB_H
#include <netdb.h>
+#endif
/* Allow Apache to use ap_mmap */
#ifdef USE_MMAP_FILES
1.56 +2 -0 apache-2.0/src/main/http_log.c
Index: http_log.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- http_log.c 2000/06/12 21:39:57 1.55
+++ http_log.c 2000/06/12 23:02:49 1.56
@@ -75,7 +75,9 @@
#include "http_log.h"
#include "http_main.h"
+#ifdef HAVE_STDARG_H
#include <stdarg.h>
+#endif
typedef struct {
char *t_name;
1.79 +4 -0 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- http_protocol.c 2000/06/12 21:46:36 1.78
+++ http_protocol.c 2000/06/12 23:02:49 1.79
@@ -77,8 +77,12 @@
#include "util_date.h" /* For parseHTTPdate and BAD_DATE */
#include "util_charset.h"
#include "mpm_status.h"
+#ifdef HAVE_STDARG_H
#include <stdarg.h>
+#endif
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
AP_HOOK_STRUCT(
AP_HOOK_LINK(post_read_request)
1.19 +6 -0 apache-2.0/src/main/http_vhost.c
Index: http_vhost.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- http_vhost.c 2000/06/12 21:46:36 1.18
+++ http_vhost.c 2000/06/12 23:02:50 1.19
@@ -70,9 +70,15 @@
#include "http_protocol.h"
#include "http_core.h"
+#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
#include <netdb.h>
+#endif
/*
* After all the definitions there's an explanation of how it's all put
1.24 +2 -0 apache-2.0/src/main/listen.c
Index: listen.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/listen.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- listen.c 2000/04/14 15:58:56 1.23
+++ listen.c 2000/06/12 23:02:50 1.24
@@ -64,7 +64,9 @@
#include "http_config.h"
#include "ap_listen.h"
#include "http_log.h"
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
ap_listen_rec *ap_listeners;
static ap_listen_rec *old_listeners;
1.19 +2 -0 apache-2.0/src/main/rfc1413.c
Index: rfc1413.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rfc1413.c 2000/05/10 01:22:31 1.18
+++ rfc1413.c 2000/06/12 23:02:50 1.19
@@ -86,7 +86,9 @@
#include "http_main.h" /* set_callback_and_alarm */
#include "util_ebcdic.h"
#include "apr_network_io.h"
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
/* Local stuff. */
/* Semi-well-known port */
1.52 +10 -1 apache-2.0/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- util.c 2000/06/12 21:46:36 1.51
+++ util.c 2000/06/12 23:02:50 1.52
@@ -80,18 +80,27 @@
#include "http_config.h"
#include "util_ebcdic.h"
+#ifdef HAVE_STDIO_H
#include <stdio.h>
+#endif
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
#include <netdb.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
+#endif
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
#ifdef HAVE_GRP_H
#include <grp.h>
#endif
-
/* A bunch of functions in util.c scan strings looking for certain characters.
* To make that more efficient we encode a lookup table. The test_char_table
1.12 +4 -0 apache-2.0/src/main/util_date.c
Index: util_date.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_date.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- util_date.c 2000/03/31 08:44:21 1.11
+++ util_date.c 2000/06/12 23:02:51 1.12
@@ -71,8 +71,12 @@
#include "ap_config.h"
#include "util_date.h"
+#ifdef HAVE_CTYPE_H
#include <ctype.h>
+#endif
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
/*
* Compare a string to a mask
1.33 +4 -0 apache-2.0/src/main/util_script.c
Index: util_script.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- util_script.c 2000/06/05 20:45:08 1.32
+++ util_script.c 2000/06/12 23:02:51 1.33
@@ -68,8 +68,12 @@
#include "util_script.h"
#include "util_date.h" /* For parseHTTPdate() */
#include "util_ebcdic.h"
+#ifdef HAVE_STDLIB_H
#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
#ifdef OS2
#define INCL_DOS
1.12 +4 -0 apache-2.0/src/main/util_uri.c
Index: util_uri.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_uri.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- util_uri.c 2000/06/12 21:46:37 1.11
+++ util_uri.c 2000/06/12 23:02:51 1.12
@@ -65,8 +65,12 @@
#include "httpd.h"
#include "http_log.h"
#include "util_uri.h"
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
+#ifdef HAVE_NETDB_H
#include <netdb.h>
+#endif
/* Some WWW schemes and their default ports; this is basically /etc/services */
/* This will become global when the protocol abstraction comes */
1.4 +2 -1 apache-2.0/src/modules/experimental/mod_charset_lite.c
Index: mod_charset_lite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_charset_lite.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_charset_lite.c 2000/06/04 19:27:02 1.3
+++ mod_charset_lite.c 2000/06/12 23:02:54 1.4
@@ -66,8 +66,9 @@
* !!!This is an extremely cheap ripoff of mod_charset.c from Russian Apache!!!
*/
-#include <errno.h>
+#ifdef HAVE_STDIO_H
#include <stdio.h>
+#endif
#include "httpd.h"
#include "http_config.h"
1.15 +8 -1 apache-2.0/src/modules/experimental/mod_mmap_static.c
Index: mod_mmap_static.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_mmap_static.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_mmap_static.c 2000/06/12 15:28:55 1.14
+++ mod_mmap_static.c 2000/06/12 23:02:54 1.15
@@ -106,11 +106,18 @@
an extra stat() that's a waste.
*/
+#ifdef HAVE_STDIO_H
#include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+/* Do we really need these anymore? rbb */
#include <fcntl.h>
#include <errno.h>
-#include <string.h>
#define CORE_PRIVATE
1.95 +4 -0 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- dexter.c 2000/06/12 21:46:46 1.94
+++ dexter.c 2000/06/12 23:02:55 1.95
@@ -76,9 +76,13 @@
#include "mpm.h"
#include "scoreboard.h"
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <poll.h>
+#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
+#endif
#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
1.16 +2 -0 apache-2.0/src/modules/mpm/dexter/scoreboard.c
Index: scoreboard.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/scoreboard.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scoreboard.c 2000/06/10 01:35:59 1.15
+++ scoreboard.c 2000/06/12 23:02:56 1.16
@@ -67,7 +67,9 @@
#include "mpm_status.h"
#include "scoreboard.h"
#include "mpm.h" /* for ap_max_daemons_limit */
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
static scoreboard *ap_scoreboard_image = NULL;
API_VAR_EXPORT char *ap_scoreboard_fname;
1.88 +5 -1 apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mpmt_pthread.c 2000/06/12 21:46:49 1.87
+++ mpmt_pthread.c 2000/06/12 23:02:57 1.88
@@ -78,8 +78,12 @@
#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
+#endif
#include <pthread.h>
#include <signal.h>
1.33 +2 -0 apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
Index: scoreboard.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- scoreboard.c 2000/06/11 14:12:03 1.32
+++ scoreboard.c 2000/06/12 23:02:57 1.33
@@ -68,7 +68,9 @@
#include "mpm_status.h"
#include "mpm.h"
#include "scoreboard.h"
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
scoreboard *ap_scoreboard_image = NULL;
new_scoreboard *ap_new_scoreboard_image = NULL;
1.101 +9 -2 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- prefork.c 2000/06/12 21:46:54 1.100
+++ prefork.c 2000/06/12 23:02:58 1.101
@@ -105,12 +105,18 @@
#include "iol_socket.h"
#include "ap_listen.h"
#include "ap_mmn.h"
-#include <sys/times.h>
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
+#endif
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
-
+#endif
#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h> /* for TCP_NODELAY */
#endif
@@ -119,6 +125,7 @@
#include <bstring.h> /* for IRIX, FD_SET calls bzero() */
#endif
#include <signal.h>
+#include <sys/times.h>
/* config globals */
1.21 +3 -2 apache-2.0/src/modules/standard/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_cgid.c 2000/06/12 21:47:00 1.20
+++ mod_cgid.c 2000/06/12 23:02:59 1.21
@@ -91,10 +91,11 @@
#include "iol_socket.h"
#include "unixd.h"
#include <sys/stat.h>
-#include <sys/socket.h> /* for sockaddr_un */
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
#include <sys/un.h> /* for sockaddr_un */
#include <sys/types.h>
-#include <sys/stat.h>
module MODULE_VAR_EXPORT cgid_module;
1.8 +8 -1 apache-2.0/src/modules/standard/mod_file_cache.c
Index: mod_file_cache.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_file_cache.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_file_cache.c 2000/06/12 15:29:04 1.7
+++ mod_file_cache.c 2000/06/12 23:02:59 1.8
@@ -109,11 +109,18 @@
an extra stat() that's a waste.
*/
+#ifdef HAVE_STDIOP_H
#include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+/* What are these here for? rbb */
#include <fcntl.h>
#include <errno.h>
-#include <string.h>
#define CORE_PRIVATE
1.39 +2 -0 apache-2.0/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_include.c 2000/06/12 15:29:04 1.38
+++ mod_include.c 2000/06/12 23:02:59 1.39
@@ -97,7 +97,9 @@
#include "http_main.h"
#include "util_script.h"
#include "http_core.h"
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
1.25 +2 -0 apache-2.0/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_log_config.c 2000/06/12 21:47:00 1.24
+++ mod_log_config.c 2000/06/12 23:03:00 1.25
@@ -176,7 +176,9 @@
#include "http_core.h" /* For REMOTE_NAME */
#include "http_log.h"
#include "http_protocol.h"
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
1.22 +4 -0 apache-2.0/src/modules/standard/mod_mime_magic.c
Index: mod_mime_magic.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_mime_magic.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_mime_magic.c 2000/06/12 21:47:01 1.21
+++ mod_mime_magic.c 2000/06/12 23:03:00 1.22
@@ -132,8 +132,12 @@
#include "http_log.h"
#include "http_protocol.h"
#include "util_script.h"
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
1.13 +13 -2 apache-2.0/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_rewrite.h 2000/06/12 21:47:04 1.12
+++ mod_rewrite.h 2000/06/12 23:03:00 1.13
@@ -94,16 +94,27 @@
/* Include from the underlaying Unix system ... */
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
+#ifdef HAVE_STDARG_H
#include <stdarg.h>
+#endif
+#ifdef HAVE_STDLIB_H
#include <stdlib.h>
+#endif
+#ifdef HAVE_TIME_H
#include <time.h>
-#include <signal.h>
-#include <errno.h>
+#endif
+#ifdef HAVE_CTYPE_H
#include <ctype.h>
+#endif
#ifndef NETWARE
#include <sys/types.h>
#endif
+/* are these needed anymore? rbb */
+#include <signal.h>
+#include <errno.h>
/* Include from the Apache server ... */
#define CORE_PRIVATE
1.16 +8 -0 apache-2.0/src/modules/standard/mod_unique_id.c
Index: mod_unique_id.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_unique_id.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_unique_id.c 2000/06/12 21:47:04 1.15
+++ mod_unique_id.c 2000/06/12 23:03:00 1.16
@@ -68,10 +68,18 @@
#include "http_log.h"
#include "http_protocol.h" /* for ap_hook_post_read_request */
+#ifdef HAVE_NETDB_H
#include <netdb.h>
+#endif
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
+#endif
typedef struct {
unsigned int stamp;
1.24 +2 -0 apache-2.0/src/os/unix/iol_socket.c
Index: iol_socket.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/iol_socket.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- iol_socket.c 2000/05/29 04:22:14 1.23
+++ iol_socket.c 2000/06/12 23:03:02 1.24
@@ -63,7 +63,9 @@
#include "apr_network_io.h"
#include "apr_file_io.h"
#include "iol_socket.h"
+#ifdef HAVE_STDLIB_H
#include <stdlib.h>
+#endif
#define FD_NONBLOCKING_SET (1)
1.5 +2 -0 apache-2.0/src/os/unix/os-inline.c
Index: os-inline.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/os-inline.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- os-inline.c 2000/03/31 09:17:16 1.4
+++ os-inline.c 2000/06/12 23:03:02 1.5
@@ -74,7 +74,9 @@
* INLINE will _not_ be set so we can use this to test if we are
* compiling this source file.
*/
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#ifndef INLINE
#define INLINE
1.17 +8 -1 apache-2.0/src/os/unix/unixd.c
Index: unixd.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/unixd.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- unixd.c 2000/06/12 21:47:14 1.16
+++ unixd.c 2000/06/12 23:03:03 1.17
@@ -62,11 +62,18 @@
#include "http_main.h"
#include "http_log.h"
#include "unixd.h"
+#ifdef HAVE_PWD_H
#include <pwd.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
-#include <sys/resource.h>
+#endif
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef HAVE_GRP_H
#include <grp.h>
+#endif
unixd_config_rec unixd_config;
1.9 +2 -0 apache-2.0/src/os/unix/unixd.h
Index: unixd.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/unixd.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- unixd.h 2000/06/06 21:45:16 1.8
+++ unixd.h 2000/06/12 23:03:03 1.9
@@ -60,7 +60,9 @@
#define UNIXD_H
#include "httpd.h"
+#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
+#endif
/* common stuff that unix MPMs will want */
1.18 +10 -2 apache-2.0/src/support/ab.c
Index: ab.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/ab.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ab.c 2000/05/27 23:49:07 1.17
+++ ab.c 2000/06/12 23:03:04 1.18
@@ -121,10 +121,18 @@
#ifdef NOT_ASCII
#include "apr_xlate.h"
#endif
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
+#ifdef HAVE_STDIO_H
#include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
#include <stdlib.h>
+#endif
+#ifdef HAVE_CTYPE_H
#include <ctype.h>
+#endif
/* ------------------- DEFINITIONS -------------------------- */
@@ -840,14 +848,14 @@
static void copyright(void)
{
if (!use_html) {
- printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.17 $> apache-2.0");
+ printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.18 $> apache-2.0");
printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
printf("\n");
}
else {
printf("<p>\n");
- printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.17 $");
+ printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.18 $");
printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
printf("</p>\n<p>\n");
1.8 +5 -1 apache-2.0/src/support/logresolve.c
Index: logresolve.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/logresolve.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- logresolve.c 2000/06/12 21:47:15 1.7
+++ logresolve.c 2000/06/12 23:03:05 1.8
@@ -40,9 +40,13 @@
*/
#include "ap_config.h"
-#include <ctype.h>
#include <stdio.h>
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_NETDB_H
#include <netdb.h>
+#endif
#if !defined(MPE) && !defined(BEOS) && !defined(WIN32)
#include <arpa/inet.h>
1.9 +5 -3 apache-2.0/src/support/rotatelogs.c
Index: rotatelogs.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/rotatelogs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rotatelogs.c 2000/06/12 21:47:17 1.8
+++ rotatelogs.c 2000/06/12 23:03:05 1.9
@@ -62,12 +62,14 @@
#include "ap_config.h"
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <stdlib.h>
#include <time.h>
#include <errno.h>
#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
#define BUFSIZE 65536