compilation fix on HP/UX

diff --git a/minires/res_send.c b/minires/res_send.c
index ab9d089f7a0e1d1d371267f1799d66545fa028ed..3b903c3554838d502fc343f0fd0452ca55c1fcc2 100644 (file)
--- a/minires/res_send.c
+++ b/minires/res_send.c
@@ -52,7 +52,7 @@
  */
 
 /*
- * Portions Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (c) 2004,2008 by Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -76,34 +76,9 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c   8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.9 2008/01/11 14:00:06 shane Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.10 2008/01/21 22:49:46 dhankins Exp $";
 #endif /* LIBC_SCCS and not lint */
 
-/* Rename the I/O functions in case we're tracing. */
-#include <omapip/omapip_p.h>
-
-ssize_t trace_mr_send(int, const void *, size_t, int);
-ssize_t trace_mr_recvfrom(int s, void *, size_t, int,
-                         struct sockaddr *, socklen_t *);
-ssize_t trace_mr_read(int, void *, size_t);
-int trace_mr_connect(int s, struct sockaddr *, socklen_t);
-int trace_mr_socket(int, int, int);
-int trace_mr_bind(int, struct sockaddr *, socklen_t);
-int trace_mr_close(int);
-time_t trace_mr_time(time_t *);
-int trace_mr_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-unsigned int trace_mr_res_randomid(unsigned int);
-
-#define send           trace_mr_send
-#define recvfrom       trace_mr_recvfrom
-#define        read            trace_mr_read
-#define connect                trace_mr_connect
-#define socket         trace_mr_socket
-#define bind           trace_mr_bind
-#define close          trace_mr_close
-#define select         trace_mr_select
-#define time           trace_mr_time
-
 /*
  * Send query to name server and wait for reply.
  */
@@ -128,6 +103,31 @@ unsigned int trace_mr_res_randomid(unsigned int);
 #include "minires/minires.h"
 #include "arpa/nameser.h"
 
+/* Rename the I/O functions in case we're tracing. */
+#include <omapip/omapip_p.h>
+
+ssize_t trace_mr_send(int, const void *, size_t, int);
+ssize_t trace_mr_recvfrom(int s, void *, size_t, int,
+                          struct sockaddr *, socklen_t *);
+ssize_t trace_mr_read(int, void *, size_t);
+int trace_mr_connect(int s, struct sockaddr *, socklen_t);
+int trace_mr_socket(int, int, int);
+int trace_mr_bind(int, struct sockaddr *, socklen_t);
+int trace_mr_close(int);
+time_t trace_mr_time(time_t *);
+int trace_mr_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+unsigned int trace_mr_res_randomid(unsigned int);
+
+#define send            trace_mr_send
+#define recvfrom        trace_mr_recvfrom
+#define read            trace_mr_read
+#define connect         trace_mr_connect
+#define socket          trace_mr_socket
+#define bind            trace_mr_bind
+#define close           trace_mr_close
+#define select          trace_mr_select
+#define time            trace_mr_time
+
 #define        CHECK_SRVR_ADDR
                
 static int cmpsock(struct sockaddr_in *a1, struct sockaddr_in *a2);