gnupg/util (ChangeLog srv.h)

[cvs user dshaw]

    Date: Thursday, December 16, 2004 @ 19:36:42
  Author: dshaw
    Path: /cvs/gnupg/gnupg/util

Modified: ChangeLog srv.h

* configure.ac: Check for arpa/nameser.h.

* srv.h: Don't include arpa/nameser.h unless we have it.  Include
"types.h" for u16.


-----------+
 ChangeLog |    3 +++
 srv.h     |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)


Index: gnupg/util/ChangeLog
diff -u gnupg/util/ChangeLog:1.170 gnupg/util/ChangeLog:1.171
--- gnupg/util/ChangeLog:1.170	Thu Dec 16 06:16:09 2004
+++ gnupg/util/ChangeLog	Thu Dec 16 19:36:42 2004
@@ -1,5 +1,8 @@
 2004-12-16  David Shaw  <dshaw at jabberwocky.com>
 
+	* srv.h: Don't include arpa/nameser.h unless we have it.  Include
+	"types.h" for u16.
+
 	* secmem.c (secmem_init): Return a flag to indicate whether we got
 	the lock.
 
Index: gnupg/util/srv.h
diff -u gnupg/util/srv.h:1.5 gnupg/util/srv.h:1.6
--- gnupg/util/srv.h:1.5	Fri Aug 29 01:29:32 2003
+++ gnupg/util/srv.h	Thu Dec 16 19:36:42 2004
@@ -1,5 +1,5 @@
 /* srv.h
- * Copyright (C) 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2004 Free Software Foundation, Inc.
  *
  * This file is part of GNUPG.
  *
@@ -25,9 +25,12 @@
 #include <windows.h>
 #else
 #include <netinet/in.h>
+#ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
+#endif
 #include <resolv.h>
 #endif
+#include "types.h"
 
 #ifndef MAXDNAME
 #define MAXDNAME 1025