summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-04-25 23:47:26 +0000
committerNick Mathewson <nickm@torproject.org>2004-04-25 23:47:26 +0000
commit568a4d187aa70648bf3e00416d8669995d368316 (patch)
tree0d20486693cf79ac70cd63d1798a2a6d7030c58a
parent9e5d2ad91ce7fbf037eab50265cd994880c98221 (diff)
downloadtor-568a4d187aa70648bf3e00416d8669995d368316.tar.gz
tor-568a4d187aa70648bf3e00416d8669995d368316.zip
Check for machine/limits.h in addition to sys/limits.h
svn:r1705
-rw-r--r--configure.in2
-rw-r--r--src/common/util.c3
-rw-r--r--src/or/or.h3
3 files changed, 7 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 1a4b9ee36d..98bc3d426b 100644
--- a/configure.in
+++ b/configure.in
@@ -137,7 +137,7 @@ AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h poll.h sys/stat.h sy
dnl These headers are not essential
-AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/wait.h sys/limits.h netinet/in.h arpa/inet.h)
+AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/wait.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h)
AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime)
AC_REPLACE_FUNCS(strlcat strlcpy)
diff --git a/src/common/util.c b/src/common/util.c
index 3374b951e7..fb92681e93 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -30,6 +30,9 @@
#ifdef HAVE_SYS_LIMITS_H
#include <sys/limits.h>
#endif
+#ifdef HAVE_MACHINE_LIMITS_H
+#include <machine/limits.h>
+#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */
#endif
diff --git a/src/or/or.h b/src/or/or.h
index f3f28f4dae..10b8b63437 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -37,6 +37,9 @@
#ifdef HAVE_SYS_LIMITS_H
#include <sys/limits.h>
#endif
+#ifdef HAVE_MACHINE_LIMITS_H
+#include <machine/limits.h>
+#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */
#endif