[configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and

_getlong in #ifndef

diff --git a/ChangeLog b/ChangeLog
index 35e6d4e5c5dd23aa47229b10810fb9fb00fbfd9a..ca06df726f09e8cda6b0b134cf24bf555d018406 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030908
+ - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
+   _getlong in #ifndef
+
 20030907
  - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)]
    Put "which" inside quotes.

diff --git a/configure.ac b/configure.ac
index b28844c0907d68cbc665120caa0879cf10a24458..bf1e180965cca93d4af1ffe3b113487cab3c9c7f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1912,6 +1912,7 @@ AC_ARG_WITH(dns,
                                        # Needed by our getrrsetbyname()
                                        AC_SEARCH_LIBS(res_query, resolv)
                                        AC_SEARCH_LIBS(dn_expand, resolv)
+                                       AC_CHECK_FUNCS(_getshort _getlong)
                                ])
                fi
        ]

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 3ba54e0da715ce3bdba887a6aa69143d9493e73b..3f75590e2f4d69f52ccc641276724ff5f7adfdac 100644 (file)
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -130,6 +130,7 @@ static int count_dns_rr(struct dns_rr *, u_int16_t, u_int16_t);
  * Routines to insert/extract short/long's.
  */
 
+#ifndef HAVE__GETSHORT
 static u_int16_t
 _getshort(msgp)
        register const u_char *msgp;
@@ -139,7 +140,9 @@ _getshort(msgp)
        GETSHORT(u, msgp);
        return (u);
 }
+#endif
 
+#ifndef HAVE__GETLONG
 static u_int32_t
 _getlong(msgp)
        register const u_char *msgp;
@@ -149,6 +152,7 @@ _getlong(msgp)
        GETLONG(u, msgp);
        return (u);
 }
+#endif
 
 int
 getrrsetbyname(const char *hostname, unsigned int rdclass,