about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--posix/unistd.h4
-rw-r--r--resolv/netdb.h4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 40eddbcf96..3cf70a99d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* posix/unistd.h: Change getpagesize and getdtablesize declaration
+	visibility some more.
+
 	* resolv/netdb.h: Relax condition to elide obsolete resolver constants.
 
 	* posix/unistd.h: Declare getpagesize in _GNU_SOURCE mode.
diff --git a/posix/unistd.h b/posix/unistd.h
index 611ddf02d1..d134ecf76b 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -986,16 +986,16 @@ extern long int gethostid (void);
 extern void sync (void) __THROW;
 
 
-# if defined __USE_GNU || !defined __USE_XOPEN2K
+# if defined __USE_BSD || !defined __USE_XOPEN2K
 /* Return the number of bytes in a page.  This is the system's page size,
    which is not necessarily the same as the hardware page size.  */
 extern int getpagesize (void)  __THROW __attribute__ ((__const__));
-# endif
 
 
 /* Return the maximum number of file descriptors
    the current process could possibly have.  */
 extern int getdtablesize (void) __THROW;
+# endif
 
 #endif /* Use BSD || X/Open Unix.  */
 
diff --git a/resolv/netdb.h b/resolv/netdb.h
index d72048cb4c..7671c6aca5 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -53,7 +53,7 @@
 
 __BEGIN_DECLS
 
-#if defined __USE_MISC || defined __USE_GNU || !defined __USE_XOPEN2K8
+#if defined __USE_MISC || !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 ())
@@ -87,7 +87,7 @@ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__));
 # define SCOPE_DELIMITER	'%'
 #endif
 
-#if defined __USE_MISC || defined __USE_GNU
+#ifdef __USE_MISC
 /* Print error indicated by `h_errno' variable on standard error.  STR
    if non-null is printed before the error string.  */
 extern void herror (__const char *__str) __THROW;