summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-12-22 17:30:12 +0000
committerNick Mathewson <nickm@torproject.org>2007-12-22 17:30:12 +0000
commit3a85c9fa65a2d6fd7d0b65726a3bbc471d39a5af (patch)
tree9d39afe0ddd37c010dc6d243c3b3a31e05dc3caf
parentfe006ad880b7183f4a430a83515eeaff87ca638a (diff)
downloadtor-3a85c9fa65a2d6fd7d0b65726a3bbc471d39a5af.tar.gz
tor-3a85c9fa65a2d6fd7d0b65726a3bbc471d39a5af.zip
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
-rw-r--r--ChangeLog3
-rw-r--r--configure.in3
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 55b349daca..ee94c7d733 100644
--- 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 535d838e62..f6bdcdaffc 100644
--- 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