Relax condition for resolver constant definition.

diff --git a/ChangeLog b/ChangeLog
index 13faa59..40eddbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
+       * resolv/netdb.h: Relax condition to elide obsolete resolver constants.
+
        * posix/unistd.h: Declare getpagesize in _GNU_SOURCE mode.
 
        [BZ #11120]

diff --git a/resolv/netdb.h b/resolv/netdb.h
index 0835939..d72048c 100644 (file)
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -53,22 +53,22 @@
 
 __BEGIN_DECLS
 
-#if defined __USE_GNU || !defined __USE_XOPEN2K8
+#if defined __USE_MISC || defined __USE_GNU || !defined __USE_XOPEN2K8
 /* Error status for non-reentrant lookup functions.
    We use a macro to access always the thread-specific `h_errno' variable.  */
-#define h_errno (*__h_errno_location ())
+# define h_errno (*__h_errno_location ())
 
 /* Function to get address of global `h_errno' variable.  */
 extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
 
 
 /* Possible values left in `h_errno'.  */
-#define        HOST_NOT_FOUND  1       /* Authoritative Answer Host not found.  */
-#define        TRY_AGAIN       2       /* Non-Authoritative Host not found,
+# define HOST_NOT_FOUND        1       /* Authoritative Answer Host not found.  */
+# define TRY_AGAIN     2       /* Non-Authoritative Host not found,
                                   or SERVERFAIL.  */
-#define        NO_RECOVERY     3       /* Non recoverable errors, FORMERR, REFUSED,
+# define NO_RECOVERY   3       /* Non recoverable errors, FORMERR, REFUSED,
                                   NOTIMP.  */
-#define        NO_DATA         4       /* Valid name, no data record of requested
+# define NO_DATA       4       /* Valid name, no data record of requested
                                   type.  */
 #endif
 #if defined __USE_MISC || defined __USE_GNU