Wrap some functions, labels, and variables in #ifdefs corresponding

to #ifdefs where they are used.  Found by lint by bret dot lambert
at gmail.

OK deraadt@.

2 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/libc/net/gethostnamadr.c b/src/lib/libc/net/gethostnamadr.c
index cae27910d0..66d7e5ccd4 100644
--- a/src/lib/libc/net/gethostnamadr.c
+++ b/src/lib/libc/net/gethostnamadr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: gethostnamadr.c,v 1.70 2007/02/18 20:38:28 ray Exp $ */
+/*      $OpenBSD: gethostnamadr.c,v 1.71 2007/05/16 04:14:23 ray Exp $ */
 /*-
  * Copyright (c) 1985, 1988, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -499,7 +499,9 @@ gethostbyname2(const char *name, int af)
         struct hostent *hp;
         char lookups[MAXDNSLUS];
         extern struct hostent *_gethtbyname2(const char *, int);
+#ifdef YP
         extern struct hostent *_yp_gethtbyname(const char *);
+#endif
 
         if (_res_init(0) == -1)
                 return (_gethtbyname2(name, af));
@@ -647,7 +649,9 @@ gethostbyaddr(const void *addr, socklen_t len, int af)
         char lookups[MAXDNSLUS];
         struct hostent *res;
         extern struct hostent *_gethtbyaddr(const void *, socklen_t, int);
+#ifdef YP
         extern struct hostent *_yp_gethtbyaddr(const void *);
+#endif
         
         if (_res_init(0) == -1) {
                 res = _gethtbyaddr(addr, len, af);
diff --git a/src/lib/libc/net/res_query.c b/src/lib/libc/net/res_query.c
index 32cd04306c..c8a45a5df5 100644
--- a/src/lib/libc/net/res_query.c
+++ b/src/lib/libc/net/res_query.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_query.c,v 1.24 2005/08/06 20:30:04 espie Exp $    */
+/*      $OpenBSD: res_query.c,v 1.25 2007/05/16 04:14:23 ray Exp $      */
 
 /*
  * ++Copyright++ 1988, 1993
@@ -318,7 +318,9 @@ res_querydomain(const char *name,
     u_char *answer,     /* buffer to put answer */
     int anslen)         /* size of answer */
 {
+#ifdef DEBUG
         struct __res_state *_resp = _THREAD_PRIVATE(_res, _res, &_res);
+#endif
         char nbuf[MAXDNAME*2+1+1];
         const char *longname = nbuf;
         int n;