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 :(

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

diff --git a/acinclude.m4 b/acinclude.m4
index 32e24cc2760897bca59a72bb9047d1911250d2b4..b5c8359d90f0d568b9da66383e38ed8a30d17f89 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -134,7 +134,11 @@ dnl If rlim_t is not defined, define it to int
 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
     ])

diff --git a/include/ap_config.h b/include/ap_config.h
index 2f0a8a3cac0d7f493d6acc2a18e01f8ed2982869..0b7298b8ee6dc950a92822383c884779b98c7c5f 100644 (file)
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -120,6 +120,10 @@ extern "C" {
 #include <sys/time.h>
 #endif
 
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif