summaryrefslogtreecommitdiff
path: root/src/common/compat.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-07-19 20:00:45 +0000
committerNick Mathewson <nickm@torproject.org>2007-07-19 20:00:45 +0000
commita1f4644a9474435ea588e91ae6923869be5228b1 (patch)
tree7e0b884ac47f9a293aba3f83a4fe10b82c9d7319 /src/common/compat.h
parentb2772f93cb922ed695ad0c9090ec5818fa3b60f5 (diff)
downloadtor-a1f4644a9474435ea588e91ae6923869be5228b1.tar.gz
tor-a1f4644a9474435ea588e91ae6923869be5228b1.zip
r13840@catbus: nickm | 2007-07-19 16:00:43 -0400
Apparently, this problem can occur on the whole BSD family. "Yay." svn:r10884
Diffstat (limited to 'src/common/compat.h')
-rw-r--r--src/common/compat.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/common/compat.h b/src/common/compat.h
index cd93452268..2371ee4676 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -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 @@ struct in6_addr
};
#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