summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-06-01 17:03:01 +0000
committerRoger Dingledine <arma@torproject.org>2004-06-01 17:03:01 +0000
commit1ef411fefdde460a03d0c37d1893fee20d450602 (patch)
tree30b74abfb86ac528c5d33502fc34a6af4a5e1f7b
parentf5e09009026016b541a37eaab21578e7d046b181 (diff)
downloadtor-1ef411fefdde460a03d0c37d1893fee20d450602.tar.gz
tor-1ef411fefdde460a03d0c37d1893fee20d450602.zip
use sys/param.h if it's there
svn:r1927
-rw-r--r--src/common/util.c6
-rw-r--r--src/or/or.h5
2 files changed, 9 insertions, 2 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 764930c0eb..2db99d6c05 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -54,12 +54,16 @@
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h> /* FreeBSD needs this to know what version it is */
+#endif
#ifdef HAVE_SYS_LIMITS_H
#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
+ /* FreeBSD has a bug where it complains that this file is obsolete,
+ and I should migrate to using sys/limits. It complains even when
I include both. */
#include <machine/limits.h>
#endif
diff --git a/src/or/or.h b/src/or/or.h
index 9714a1d682..6c4c5eff75 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -40,13 +40,16 @@
#endif
#include "../common/torint.h"
#include "../common/fakepoll.h"
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h> /* FreeBSD needs this to know what version it is */
+#endif
#ifdef HAVE_SYS_LIMITS_H
#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
+ and I should migrate to using sys/limits. It complains even when
I include both. */
#include <machine/limits.h>
#endif