Libinfo-278.0.3.tar.gz

[apple/libinfo.git] / dns.subproj / res_debug.c

diff --git a/dns.subproj/res_debug.c b/dns.subproj/res_debug.c
index 656797de824362d03655d7b28ff7331940e21ae5..bf837306f50387494017048cff5a88b495415815 100644 (file)
--- a/dns.subproj/res_debug.c
+++ b/dns.subproj/res_debug.c
@@ -78,17 +78,17 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_debug.c        8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id: res_debug.c,v 1.3 2002/02/19 20:36:12 epeyton Exp $";
+static char rcsid[] = "$Id: res_debug.c,v 1.5 2004/06/11 23:16:00 majka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <arpa/nameser.h>
+#include <arpa/nameser8_compat.h>
 
 #include <stdio.h>
 #include <netdb.h>
-#include <resolv.h>
+#include <resolv8_compat.h>
 #if defined(BSD) && (BSD >= 199103)
 # include <string.h>
 #else
@@ -476,7 +476,8 @@ __p_rr(cp, msg, file)
        const u_char *cp, *msg;
        FILE *file;
 {
-       int type, class, dlen, n, c;
+       int type, class, n, c;
+       int dlen;
        struct in_addr inaddr;
        const u_char *cp1, *cp2;
        u_int32_t tmpttl, t;
@@ -703,8 +704,11 @@ __p_rr(cp, msg, file)
        putc('\n', file);
 #endif
        if (cp - cp1 != dlen) {
-               fprintf(file, ";; packet size error (found %d, dlen was %d)\n",
-                       cp - cp1, dlen);
+#ifdef __LP64__
+               fprintf(file, ";; packet size error (found %ld, dlen was %d)\n", cp - cp1, dlen);
+#else
+               fprintf(file, ";; packet size error (found %d, dlen was %d)\n", cp - cp1, dlen);
+#endif
                cp = NULL;
        }
        return (cp);