From 1841aa456bc3a8fcecd96cfaa68dc88332a30db3 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Wed, 26 May 2004 20:27:54 +0000
Subject: rik's patch to not complain about freebsd's bug

svn:r1921
---
 src/common/util.c | 4 ++++
 src/or/or.h       | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/common/util.c b/src/common/util.c
index 727af645b..764930c0e 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -58,8 +58,12 @@
 #include <sys/limits.h>
 #endif
 #ifdef HAVE_MACHINE_LIMITS_H
+#ifndef __FreeBSD__
+  /* FreeBSD has a bug where it complains that this file is obsolete,                               and I should migrate to using sys/limits. It complaints even when
+     I include both. */
 #include <machine/limits.h>
 #endif
+#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 7d46e902a..9714a1d68 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -44,8 +44,13 @@
 #include <sys/limits.h>
 #endif
 #ifdef HAVE_MACHINE_LIMITS_H
+#ifndef __FreeBSD__
+  /* FreeBSD has a bug where it complains that this file is obsolete,
+     and I should migrate to using sys/limits. It complaints even when
+     I include both. */
 #include <machine/limits.h>
 #endif
+#endif
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */
 #endif
-- 
cgit v1.2.3