0769c4ce18
the former is still provided through nameser_compat.h while the latter is not available on older NetBSDs should fix build error seen in the 2.0.2 bulk build
92 lines
2.7 KiB
Text
92 lines
2.7 KiB
Text
$NetBSD: patch-aa,v 1.2 2005/09/16 15:24:23 drochner Exp $
|
|
|
|
--- ppl/unix/ppldnsv6.c.orig 2005-01-26 17:58:44.000000000 +0100
|
|
+++ ppl/unix/ppldnsv6.c
|
|
@@ -314,41 +314,41 @@ ppl_dns_resolv (ppl_dns_ip_t ** dns_ips,
|
|
cp += n;
|
|
|
|
|
|
-#if defined(__NetBSD__) || defined(__OpenBSD__) ||\
|
|
+#if defined(__OpenBSD__) ||\
|
|
defined(OLD_NAMESER) || defined(__FreeBSD__)
|
|
type = _get_short (cp);
|
|
cp += sizeof (u_short);
|
|
-#elif defined(__APPLE_CC__)
|
|
+#elif defined(__APPLE_CC__) || defined(__NetBSD__)
|
|
GETSHORT(type, cp);
|
|
#else
|
|
NS_GET16 (type, cp);
|
|
#endif
|
|
|
|
-#if defined(__NetBSD__) || defined(__OpenBSD__) ||\
|
|
+#if defined(__OpenBSD__) ||\
|
|
defined(OLD_NAMESER) || defined(__FreeBSD__)
|
|
aclass = _get_short (cp);
|
|
cp += sizeof (u_short);
|
|
-#elif defined(__APPLE_CC__)
|
|
+#elif defined(__APPLE_CC__) || defined(__NetBSD__)
|
|
GETSHORT(aclass, cp);
|
|
#else
|
|
NS_GET16 (aclass, cp);
|
|
#endif
|
|
|
|
-#if defined(__NetBSD__) || defined(__OpenBSD__) ||\
|
|
+#if defined(__OpenBSD__) ||\
|
|
defined(OLD_NAMESER) || defined(__FreeBSD__)
|
|
ttl = _get_long (cp);
|
|
cp += sizeof (u_long);
|
|
-#elif defined(__APPLE_CC__)
|
|
+#elif defined(__APPLE_CC__) || defined(__NetBSD__)
|
|
GETLONG(ttl, cp);
|
|
#else
|
|
NS_GET32 (ttl, cp);
|
|
#endif
|
|
|
|
-#if defined(__NetBSD__) || defined(__OpenBSD__) ||\
|
|
+#if defined(__OpenBSD__) ||\
|
|
defined(OLD_NAMESER) || defined(__FreeBSD__)
|
|
dlen = _get_short (cp);
|
|
cp += sizeof (u_short);
|
|
-#elif defined(__APPLE_CC__)
|
|
+#elif defined(__APPLE_CC__) || defined(__NetBSD__)
|
|
GETSHORT(dlen, cp);
|
|
#else
|
|
NS_GET16 (dlen, cp);
|
|
@@ -359,31 +359,31 @@ ppl_dns_resolv (ppl_dns_ip_t ** dns_ips,
|
|
cp += dlen;
|
|
continue;
|
|
}
|
|
-#if defined(__NetBSD__) || defined(__OpenBSD__) ||\
|
|
+#if defined(__OpenBSD__) ||\
|
|
defined(OLD_NAMESER) || defined(__FreeBSD__)
|
|
pref = _get_short (cp);
|
|
cp += sizeof (u_short);
|
|
-#elif defined(__APPLE_CC__)
|
|
+#elif defined(__APPLE_CC__) || defined(__NetBSD__)
|
|
GETSHORT(pref, cp);
|
|
#else
|
|
NS_GET16 (pref, cp);
|
|
#endif
|
|
|
|
-#if defined(__NetBSD__) || defined(__OpenBSD__) ||\
|
|
+#if defined(__OpenBSD__) ||\
|
|
defined(OLD_NAMESER) || defined(__FreeBSD__)
|
|
weight = _get_short (cp);
|
|
cp += sizeof (u_short);
|
|
-#elif defined(__APPLE_CC__)
|
|
+#elif defined(__APPLE_CC__) || defined(__NetBSD__)
|
|
GETSHORT(weight, cp);
|
|
#else
|
|
NS_GET16 (weight, cp);
|
|
#endif
|
|
|
|
-#if defined(__NetBSD__) || defined(__OpenBSD__) ||\
|
|
+#if defined(__OpenBSD__) ||\
|
|
defined(OLD_NAMESER) || defined(__FreeBSD__)
|
|
port = _get_short (cp);
|
|
cp += sizeof (u_short);
|
|
-#elif defined(__APPLE_CC__)
|
|
+#elif defined(__APPLE_CC__) || defined(__NetBSD__)
|
|
GETSHORT(port, cp);
|
|
#else
|
|
NS_GET16 (port, cp);
|