From d94a4670800de6e8f088b8630ad5142866127980 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@gmail.com>
Date: Sun, 26 Feb 2012 21:32:56 -0500
Subject: Add first fixes for conformtest for POSIX2008

---
 include/arpa/inet.h  | 2 ++
 include/bits/dlfcn.h | 2 ++
 include/langinfo.h   | 2 ++
 include/monetary.h   | 2 ++
 include/sys/poll.h   | 2 ++
 5 files changed, 10 insertions(+)

(limited to 'include')

diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index dc44341140..63ece7029a 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,5 +1,6 @@
 #include <inet/arpa/inet.h>
 
+#ifndef _ISOMAC
 extern int __inet_aton (const char *__cp, struct in_addr *__inp);
 libc_hidden_proto (__inet_aton)
 
@@ -8,3 +9,4 @@ libc_hidden_proto (inet_ntop)
 libc_hidden_proto (inet_pton)
 libc_hidden_proto (inet_makeaddr)
 libc_hidden_proto (inet_netof)
+#endif
diff --git a/include/bits/dlfcn.h b/include/bits/dlfcn.h
index c31a645bc8..47652a11a2 100644
--- a/include/bits/dlfcn.h
+++ b/include/bits/dlfcn.h
@@ -1,3 +1,5 @@
 #include_next <bits/dlfcn.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (_dl_mcount_wrapper_check)
+#endif
diff --git a/include/langinfo.h b/include/langinfo.h
index 37a91c699d..d60d7f6382 100644
--- a/include/langinfo.h
+++ b/include/langinfo.h
@@ -2,9 +2,11 @@
 
 #include <locale/langinfo.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (nl_langinfo)
 
 extern __typeof (nl_langinfo_l) __nl_langinfo_l;
 libc_hidden_proto (__nl_langinfo_l)
+#endif
 
 #endif
diff --git a/include/monetary.h b/include/monetary.h
index 98b3dbf294..e6870138f8 100644
--- a/include/monetary.h
+++ b/include/monetary.h
@@ -1,5 +1,7 @@
 #include <stdlib/monetary.h>
+#ifndef _ISOMAC
 #include <stdarg.h>
 
 extern ssize_t __vstrfmon_l (char *s, size_t maxsize, __locale_t loc,
 			     const char *format, va_list ap);
+#endif
diff --git a/include/sys/poll.h b/include/sys/poll.h
index 4285eee55b..a42bc93873 100644
--- a/include/sys/poll.h
+++ b/include/sys/poll.h
@@ -1,9 +1,11 @@
 #ifndef	_SYS_POLL_H
 # include <io/sys/poll.h>
 
+#ifndef _ISOMAC
 extern int __poll (struct pollfd *__fds, unsigned long int __nfds,
 		   int __timeout);
 libc_hidden_proto (__poll)
 libc_hidden_proto (ppoll)
+#endif
 
 #endif
-- 
cgit 1.4.1