aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-12-23 19:31:50 -0800
committerUlrich Drepper <drepper@redhat.com>2009-12-23 19:31:50 -0800
commit63de5ef70af0eef3bc6af21463eac8e8efa74afb (patch)
tree19313f3569982d204c9f53afd936a8e371a5f202
parent7ed319d7da45907e0858de27760a6f7c9d90dce5 (diff)
downloadglibc-63de5ef70af0eef3bc6af21463eac8e8efa74afb.tar
glibc-63de5ef70af0eef3bc6af21463eac8e8efa74afb.tar.gz
glibc-63de5ef70af0eef3bc6af21463eac8e8efa74afb.tar.bz2
glibc-63de5ef70af0eef3bc6af21463eac8e8efa74afb.zip
Fix isomac test after recent header change.
-rw-r--r--ChangeLog5
-rw-r--r--include/stdlib.h6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 18a6c16589..4be0d03940 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-23 Ulrich Drepper <drepper@redhat.com>
+
+ * include/stdlib.h: Exclude some includes and prototypes if _ISOMAC
+ is defined.
+
2009-12-22 Samuel Thibault <samuel.thibault@ens-lyon.org>
* hurd/hurdioctl.c (_hurd_locked_install_cttyid): Set newctty to
diff --git a/include/stdlib.h b/include/stdlib.h
index f540bece9c..b4799d7d04 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -9,7 +9,9 @@
/* Now define the internal interfaces. */
#ifndef __Need_M_And_C
-# include <sys/stat.h>
+# ifndef _ISOMAC
+# include <sys/stat.h>
+# endif
__BEGIN_DECLS
@@ -78,8 +80,10 @@ extern int __clearenv (void);
extern char *__canonicalize_file_name (__const char *__name);
extern char *__realpath (__const char *__name, char *__resolved);
extern int __ptsname_r (int __fd, char *__buf, size_t __buflen);
+# ifndef _ISOMAC
extern int __ptsname_internal (int fd, char *buf, size_t buflen,
struct stat64 *stp);
+# endif
extern int __getpt (void);
extern int __posix_openpt (int __oflag);