diff options
-rw-r--r-- | util/ChangeLog | 3 | ||||
-rw-r--r-- | util/srv.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 566b1fa62..c4a2315ca 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,5 +1,8 @@ 2004-12-16 David Shaw <[email protected]> + * 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. diff --git a/util/srv.h b/util/srv.h index 903a80483..2270f6a5f 100644 --- a/util/srv.h +++ b/util/srv.h @@ -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 |