aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-01-14 10:05:36 -0800
committerUlrich Drepper <drepper@redhat.com>2010-01-14 10:05:36 -0800
commit63ee841069628f4af58f7e3c27ac17c7ae711c43 (patch)
treeb38ea0afe54f013481237e36cf0939162e60cfd6
parentb1a664426773dc7f80886f99962ee8f9b36d2c0f (diff)
downloadglibc-63ee841069628f4af58f7e3c27ac17c7ae711c43.zip
glibc-63ee841069628f4af58f7e3c27ac17c7ae711c43.tar.gz
glibc-63ee841069628f4af58f7e3c27ac17c7ae711c43.tar.bz2
Relax condition for resolver constant definition.
-rw-r--r--ChangeLog2
-rw-r--r--resolv/netdb.h12
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 13faa59..40eddbc 100644
--- 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
--- 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