1999-03-07 Mark Kettenis <kettenis@gnu.org>

[kopensolaris-gnu/glibc.git] / resolv / resolv.h

diff --git a/resolv/resolv.h b/resolv/resolv.h
index b14cda0..c9a056f 100644 (file)
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -58,8 +58,10 @@
  *     $Id$
  */
 
-#ifndef _RESOLV_H_
-#define        _RESOLV_H_
+#ifndef _RESOLV_H
+#define        _RESOLV_H 1
+
+#include <features.h>
 
 #include <sys/param.h>
 #if (!defined(BSD)) || (BSD < 199306)
@@ -67,8 +69,8 @@
 #else
 # include <sys/types.h>
 #endif
-#include <sys/cdefs.h>
 #include <stdio.h>
+#include <netinet/in.h>
 
 /*
  * Revision information.  This is the release date in YYYYMMDD format.
@@ -168,19 +170,19 @@ struct __res_state {
 typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
        res_sendhookact;
 
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
-                                             const u_char **query,
-                                             int *querylen,
-                                             u_char *ans,
-                                             int anssiz,
-                                             int *resplen));
+typedef res_sendhookact (*res_send_qhook)__PMT((struct sockaddr_in * const *ns,
+                                               const u_char **query,
+                                               int *querylen,
+                                               u_char *ans,
+                                               int anssiz,
+                                               int *resplen));
 
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
-                                             const u_char *query,
-                                             int querylen,
-                                             u_char *ans,
-                                             int anssiz,
-                                             int *resplen));
+typedef res_sendhookact (*res_send_rhook)__PMT((const struct sockaddr_in *ns,
+                                               const u_char *query,
+                                               int querylen,
+                                               u_char *ans,
+                                               int anssiz,
+                                               int *resplen));
 
 struct res_sym {
        int     number;         /* Identifying number, like T_MX */
@@ -293,4 +295,4 @@ int         res_queriesmatch __P((const u_char *, const u_char *,
 void           res_close __P((void));
 __END_DECLS
 
-#endif /* !_RESOLV_H_ */
+#endif /* resolv.h */