diff options
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/Makefile | 2 | ||||
| -rw-r--r-- | resolv/arpa/nameser.h | 6 | ||||
| -rw-r--r-- | resolv/netdb.h | 2 | ||||
| -rw-r--r-- | resolv/resolv.h | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/resolv/Makefile b/resolv/Makefile index 4d11b4d366..f48f841b9a 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -39,7 +39,9 @@ vpath %.c nss_dns libnss_dns-routines := dns-host dns-network libnss_dns-map := libnss_dns.map +ifneq ($(build-static-nss),yes) libnss_dns-inhibit-o = $(filter-out .so,$(object-suffixes)) +endif include ../Rules diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index 4db67d0602..34597500ed 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -80,8 +80,8 @@ * $Id$ */ -#ifndef _NAMESER_H_ -#define _NAMESER_H_ +#ifndef _ARPA_NAMESER_H +#define _ARPA_NAMESER_H 1 #include <sys/param.h> #if (!defined(BSD)) || (BSD < 199306) @@ -389,4 +389,4 @@ extern u_int32_t _getlong __P((const u_char *)); (cp) += INT32SZ; \ } -#endif /* !_NAMESER_H_ */ +#endif /* arpa/nameser.h */ diff --git a/resolv/netdb.h b/resolv/netdb.h index 8f96528504..c59553c7ed 100644 --- a/resolv/netdb.h +++ b/resolv/netdb.h @@ -21,8 +21,8 @@ system calls). */ #ifndef _NETDB_H - #define _NETDB_H 1 + #include <features.h> /* This is necessary to make this include file properly replace the diff --git a/resolv/resolv.h b/resolv/resolv.h index b14cda0634..4dae715659 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -58,8 +58,8 @@ * $Id$ */ -#ifndef _RESOLV_H_ -#define _RESOLV_H_ +#ifndef _RESOLV_H +#define _RESOLV_H 1 #include <sys/param.h> #if (!defined(BSD)) || (BSD < 199306) @@ -293,4 +293,4 @@ int res_queriesmatch __P((const u_char *, const u_char *, void res_close __P((void)); __END_DECLS -#endif /* !_RESOLV_H_ */ +#endif /* resolv.h */ |