[or-cvs] Do not include machine/limits.h on __FreeBSD_kernel__ either

Peter Palfrader weasel at seul.org
Mon Apr 10 19:53:29 UTC 2006


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

Modified Files:
      Tag: tor-0_1_1-patches
	or.h 
Log Message:
Do not include machine/limits.h on __FreeBSD_kernel__ either

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.824
retrieving revision 1.824.2.1
diff -u -p -d -r1.824 -r1.824.2.1
--- or.h	10 Apr 2006 01:35:56 -0000	1.824
+++ or.h	10 Apr 2006 19:53:27 -0000	1.824.2.1
@@ -49,10 +49,13 @@
 #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



More information about the tor-commits mailing list