r17340@catbus: nickm | 2007-12-22 12:30:07 -0500

 Try to resolve bug 553 by adding a sys/time.h include to the autoconf test for rlim_t.

svn:r12931

diff --git a/ChangeLog b/ChangeLog
index 55b349daca26540ea66bddf2ebab73f78f962221..ee94c7d733928ae2dd796410a7118a2176fb197c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@ Changes in version 0.2.0.14-alpha - 2007-12-??
     - Make "GETINFO/desc-annotations/id/<OR digest>" actually work.
     - Make PublishServerDescriptor default to 1, so the default doesn't
       have to change as we invent new directory protocol versions.
+    - Fix test for rlim_t on OSX 10.3: sys/resource.h doesn't want to
+      be included unless sys/time.h is already included.  Fixes
+      bug 553.  Bugfix on 0.2.0.x.
 
   o Minor features:
     - If BridgeRelay is set to 1, then the default for

diff --git a/configure.in b/configure.in
index 535d838e6291b8d8e8107bd42351e3136076cfed..f6bdcdaffcd667d51edddf4ed792def468bcdc5b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -397,6 +397,9 @@ AC_CHECK_TYPES([rlim_t], , ,
 [#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif