[or-cvs] r10884: Apparently, this problem can occur on the whole BSD family. (in tor/trunk: . src/common src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-07-19 16:00:45 -0400 (Thu, 19 Jul 2007)
New Revision: 10884

Modified:
   tor/trunk/
   tor/trunk/src/common/compat.h
   tor/trunk/src/or/eventdns.c
Log:
 r13840@catbus:  nickm | 2007-07-19 16:00:43 -0400
 Apparently, this problem can occur on the whole BSD family. "Yay."



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13840] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/common/compat.h
===================================================================
--- tor/trunk/src/common/compat.h	2007-07-19 19:50:20 UTC (rev 10883)
+++ tor/trunk/src/common/compat.h	2007-07-19 20:00:45 UTC (rev 10884)
@@ -42,8 +42,8 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#ifdef HAVE_NETINET_IN6_H
-#include <netinet/in6.h>
+#ifdef HAVE_NETINET6_IN6_H
+#include <netinet6/in6.h>
 #endif
 
 #ifndef NULL_REP_IS_ZERO_BYTES
@@ -283,8 +283,9 @@
 };
 #endif
 
-#if defined(__APPLE__) || defined(__darwin__)
-/* OSX seems not to define these. */
+#if defined(__APPLE__) || defined(__darwin__) || defined(__FreeBSD__) \
+    || defined (__NetBSD__) || defined(__OpenBSD__)
+/* Many BSD variants seem not to define these. */
 #ifndef s6_addr16
 #define s6_addr16 __u6_addr.__u6_addr16
 #endif

Modified: tor/trunk/src/or/eventdns.c
===================================================================
--- tor/trunk/src/or/eventdns.c	2007-07-19 19:50:20 UTC (rev 10883)
+++ tor/trunk/src/or/eventdns.c	2007-07-19 20:00:45 UTC (rev 10884)
@@ -104,7 +104,7 @@
 #endif
 
 #ifdef HAVE_NETINET_IN6_H
-#include <netinet/in6.h>
+#include <netinet6/in6.h>
 #endif
 
 #ifdef WIN32