diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-05-26 20:27:54 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-05-26 20:27:54 +0000 |
| commit | 1841aa456bc3a8fcecd96cfaa68dc88332a30db3 (patch) | |
| tree | 988b284414fc8a484ed18a44e9185e614b342947 | |
| parent | 5f36b11fe0125186c6f9cff5ba7e408d7642ba58 (diff) | |
| download | tor-1841aa456bc3a8fcecd96cfaa68dc88332a30db3.tar.gz tor-1841aa456bc3a8fcecd96cfaa68dc88332a30db3.zip | |
rik's patch to not complain about freebsd's bug
svn:r1921
| -rw-r--r-- | src/common/util.c | 4 | ||||
| -rw-r--r-- | src/or/or.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/common/util.c b/src/common/util.c index 727af645b0..764930c0eb 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 7d46e902aa..9714a1d682 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 |