You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/06/10 14:02:32 UTC
cvs commit: apache-2.0/src/lib/apr/include apr_thread_proc.h
trawick 00/06/10 05:02:31
Modified: src acinclude.m4
src/include ap_config.h
src/lib/apr configure.in
src/lib/apr/include apr_thread_proc.h
Log:
Get FreeBSD building again with the resource limiting changes (FreeBSD
3.4, at least).
rlim_t is defined in <sys/types.h>, so we usually need that.
Some stuff in <sys/resource.h> needs <sys/time.h> for timeval just to
be able to compile :(
Revision Changes Path
1.32 +5 -1 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- acinclude.m4 2000/06/08 23:12:22 1.31
+++ acinclude.m4 2000/06/10 12:02:26 1.32
@@ -134,7 +134,11 @@
dnl
AC_DEFUN(AC_TYPE_RLIM_T, [
AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
- AC_TRY_COMPILE([#include <sys/resource.h>], [rlim_t spoon;], [
+ AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+], [rlim_t spoon;], [
ac_cv_type_rlim_t=yes
],[ac_cv_type_rlim_t=no
])
1.32 +4 -0 apache-2.0/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ap_config.h 2000/06/08 21:32:13 1.31
+++ ap_config.h 2000/06/10 12:02:29 1.32
@@ -120,6 +120,10 @@
#include <sys/time.h>
#endif
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
1.104 +4 -1 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- configure.in 2000/06/09 22:05:35 1.103
+++ configure.in 2000/06/10 12:02:30 1.104
@@ -424,7 +424,10 @@
AC_SUBST(oc)
AC_MSG_CHECKING(struct rlimit)
-AC_TRY_RUN([#include <sys/resource.h>
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
main()
{
struct rlimit limit;
1.36 +1 -0 apache-2.0/src/lib/apr/include/apr_thread_proc.h
Index: apr_thread_proc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- apr_thread_proc.h 2000/06/06 21:45:10 1.35
+++ apr_thread_proc.h 2000/06/10 12:02:31 1.36
@@ -59,6 +59,7 @@
#include "apr_general.h"
#include "apr_errno.h"
#if APR_HAVE_STRUCT_RLIMIT
+#include <sys/time.h>
#include <sys/resource.h>
#endif