[or-cvs] It is amazing how often this simple logic is duplicated. T...

[Peter Palfrader]

Update of /home/or/cvsroot/tor/src/common
In directory moria:/tmp/cvs-serv18858

Modified Files:
      Tag: tor-0_1_1-patches
	util.c 
Log Message:
It is amazing how often this simple logic is duplicated.  This is now the 3rd instance.  Who would have thought

Index: util.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/util.c,v
retrieving revision 1.254
retrieving revision 1.254.2.1
diff -u -p -d -r1.254 -r1.254.2.1
--- util.c	3 Apr 2006 00:26:51 -0000	1.254
+++ util.c	10 May 2006 10:27:09 -0000	1.254.2.1
@@ -53,10 +53,13 @@ const char util_c_id[] = "$Id$";
 #include <sys/limits.h>
 #endif
 #ifdef HAVE_MACHINE_LIMITS_H
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
   /* 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. */
+     I include both.
+     __FreeBSD_kernel__ is defined by Debian GNU/kFreeBSD which
+      does the same thing (but doesn't defined __FreeBSD__).
+     */
 #include <machine/limits.h>
 #endif
 #endif