First steps to get conformtest fully working

48 files changed, 115 insertions, 23 deletions

diff --git a/include/aio.h b/include/aio.h
index c81dae9706..90c74f9951 100644
--- a/include/aio.h
+++ b/include/aio.h
@@ -1,6 +1,7 @@
 #ifndef _AIO_H
 #include <rt/aio.h>
 
+#ifndef _ISOMAC
 /* Now define the internal interfaces.  */
 extern void __aio_init (const struct aioinit *__init);
 
@@ -8,5 +9,6 @@ extern void __aio_init (const struct aioinit *__init);
    lio_listio and we do not issue events for each individual list
    element.  */
 #define LIO_NO_INDIVIDUAL_EVENT	128
+#endif
 
 #endif
diff --git a/include/assert.h b/include/assert.h
index 573eb404ec..d0d9259ab3 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -1,5 +1,6 @@
 #include <assert/assert.h>
 
+#ifndef _ISOMAC
 /* This prints an "Assertion failed" message and aborts.
    In installed assert.h this is only conditionally declared,
    so it has to be repeated here.  */
@@ -19,7 +20,8 @@ extern void __assert_fail_base (const char *fmt, const char *assertion,
 				const char *function)
      __THROW  __attribute__ ((__noreturn__));
 
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+# if !defined NOT_IN_libc || defined IS_IN_rtld
 hidden_proto (__assert_fail)
 hidden_proto (__assert_perror_fail)
+# endif
 #endif
diff --git a/include/ctype.h b/include/ctype.h
index 4b5abda375..6a18039e3f 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -1,5 +1,6 @@
 #ifndef _CTYPE_H
 
+#ifndef _ISOMAC
 /* Initialize ctype locale data.  */
 extern void __ctype_init (void);
 libc_hidden_proto (__ctype_init)
@@ -46,9 +47,11 @@ __ctype_tolower_loc (void)
 }
 
 # endif	/* Not NOT_IN_libc.  */
+#endif
 
-# include <ctype/ctype.h>
+#include <ctype/ctype.h>
 
+#ifndef _ISOMAC
 # if !defined __NO_CTYPE && !defined NOT_IN_libc
 /* The spec says that isdigit must only match the decimal digits.  We
    can check this without a memory access.  */
@@ -59,5 +62,6 @@ __ctype_tolower_loc (void)
 #  undef __isdigit_l
 #  define __isdigit_l(c, l) ({ int __c = (c); __c >= '0' && __c <= '9'; })
 # endif
+#endif
 
 #endif /* ctype.h */
diff --git a/include/dirent.h b/include/dirent.h
index 28bf432301..2e88005e00 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -1,6 +1,7 @@
 #ifndef _DIRENT_H
-# include <dirstream.h>
 # include <dirent/dirent.h>
+# ifndef _ISOMAC
+# include <dirstream.h>
 # include <sys/stat.h>
 # include <stdbool.h>
 
@@ -44,5 +45,6 @@ extern void __scandir_cancel_handler (void *arg);
 libc_hidden_proto (rewinddir)
 libc_hidden_proto (scandirat)
 libc_hidden_proto (scandirat64)
+# endif
 
 #endif
diff --git a/include/dlfcn.h b/include/dlfcn.h
index ae9c886087..a67b2e3251 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -1,5 +1,6 @@
 #ifndef _DLFCN_H
 #include <dlfcn/dlfcn.h>
+#ifndef _ISOMAC
 #include <link.h>		/* For ElfW.  */
 #include <stdbool.h>
 
@@ -146,5 +147,6 @@ extern void __libc_register_dl_open_hook (struct link_map *map)
 extern void __libc_register_dlfcn_hook (struct link_map *map)
      attribute_hidden;
 #endif
+#endif
 
 #endif
diff --git a/include/fcntl.h b/include/fcntl.h
index 7afbd1c74c..b645ffc000 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -1,6 +1,7 @@
 #ifndef _FCNTL_H
 #include <io/fcntl.h>
 
+#ifndef _ISOMAC
 /* Now define the internal interfaces.  */
 extern int __open64 (const char *__file, int __oflag, ...);
 libc_hidden_proto (__open64)
@@ -44,5 +45,6 @@ extern int __have_atfcts attribute_hidden;
 #ifdef O_CLOEXEC
 extern int __have_o_cloexec attribute_hidden;
 #endif
+#endif
 
 #endif
diff --git a/include/fnmatch.h b/include/fnmatch.h
index 2cdad0a40f..9ef8150eda 100644
--- a/include/fnmatch.h
+++ b/include/fnmatch.h
@@ -2,6 +2,8 @@
 
 #include <posix/fnmatch.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (fnmatch)
+#endif
 
 #endif
diff --git a/include/glob.h b/include/glob.h
index a0c05977f7..228fe30ca8 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -1,6 +1,7 @@
 #ifndef	_GLOB_H
 #include <posix/glob.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (glob)
 libc_hidden_proto (glob64)
 libc_hidden_proto (globfree)
@@ -11,5 +12,6 @@ extern int __glob_pattern_p (const char *__pattern, int __quote);
 extern int __glob64 (const char *__pattern, int __flags,
 		     int (*__errfunc) (const char *, int),
 		     glob64_t *__pglob);
+#endif
 
 #endif
diff --git a/include/grp.h b/include/grp.h
index 9fa71eac75..0fb5c9a574 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -1,6 +1,7 @@
 #ifndef _GRP_H
 #include <grp/grp.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (setgroups)
 
 /* Now define the internal interfaces.  */
@@ -60,3 +61,4 @@ DECLARE_NSS_PROTOTYPES (nisplus)
 
 #undef DECLARE_NSS_PROTOTYPES
 #endif
+#endif
diff --git a/include/libio.h b/include/libio.h
index 633ee51bb7..aca7000f8e 100644
--- a/include/libio.h
+++ b/include/libio.h
@@ -1,5 +1,6 @@
 #include <libio/libio.h>
 
+#ifndef _ISOMAC
 #ifndef _LIBC_LIBIO_H
 #define _LIBC_LIBIO_H
 
@@ -22,3 +23,4 @@ libc_hidden_proto (__wuflow)
 #endif
 
 #endif
+#endif
diff --git a/include/locale.h b/include/locale.h
index a296a5f8f6..8091e1dc80 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -1,6 +1,7 @@
 #ifndef	_LOCALE_H
 #include <locale/locale.h>
 
+#ifndef _ISOMAC
 extern __typeof (uselocale) __uselocale;
 
 libc_hidden_proto (setlocale)
@@ -22,3 +23,4 @@ extern struct lconv *__localeconv (void);
 extern const char *__current_locale_name (int category) attribute_hidden;
 
 #endif
+#endif
diff --git a/include/math.h b/include/math.h
index 3934880171..2b040c67fd 100644
--- a/include/math.h
+++ b/include/math.h
@@ -2,6 +2,7 @@
 
 #include <math/math.h>
 
+#ifndef _ISOMAC
 /* Now define the internal interfaces.  */
 extern int __matherr (struct exception *__exc);
 
@@ -36,3 +37,4 @@ extern int __isinf_nsf (float);
 extern int __isinf_nsl (long double);
 
 #endif
+#endif
diff --git a/include/net/if.h b/include/net/if.h
index 872ab6da15..1d862260c7 100644
--- a/include/net/if.h
+++ b/include/net/if.h
@@ -2,9 +2,11 @@
 
 # include_next <net/if.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (if_nametoindex)
 libc_hidden_proto (if_indextoname)
 libc_hidden_proto (if_nameindex)
 libc_hidden_proto (if_freenameindex)
+#endif
 
 #endif
diff --git a/include/netdb.h b/include/netdb.h
index 0db3579259..3f2ae06451 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -1,6 +1,7 @@
 #ifndef	_NETDB_H
 #include <resolv/netdb.h>
 
+#ifndef _ISOMAC
 /* Macros for accessing h_errno from inside libc.  */
 # undef  h_errno
 # ifdef _LIBC_REENTRANT
@@ -280,5 +281,6 @@ DECLARE_NSS_PROTOTYPES (nis)
 DECLARE_NSS_PROTOTYPES (nisplus)
 
 #undef DECLARE_NSS_PROTOTYPES
+#endif
 
 #endif /* !_NETDB_H */
diff --git a/include/netinet/in.h b/include/netinet/in.h
index 876f1a4369..6fb5c86de9 100644
--- a/include/netinet/in.h
+++ b/include/netinet/in.h
@@ -2,8 +2,10 @@
 
 #include <inet/netinet/in.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (bindresvport)
 libc_hidden_proto (in6addr_loopback)
 libc_hidden_proto (in6addr_any)
+#endif
 
 #endif
diff --git a/include/pthread.h b/include/pthread.h
index f8860bdf93..51854f6053 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -1,4 +1,6 @@
 #include_next <pthread.h>
 
+#ifndef _ISOMAC
 /* This function is called to initialize the pthread library.  */
 extern void __pthread_initialize (void) __attribute__ ((weak));
+#endif
diff --git a/include/pwd.h b/include/pwd.h
index 465c17c50c..bd7fecc16e 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -1,6 +1,7 @@
 #ifndef _PWD_H
 #include <pwd/pwd.h>
 
+#ifndef _ISOMAC
 /* Now define the internal interfaces.  */
 extern int __getpwent_r (struct passwd *__resultbuf, char *__buffer,
 			 size_t __buflen, struct passwd **__result)
@@ -51,5 +52,6 @@ DECLARE_NSS_PROTOTYPES (nis)
 DECLARE_NSS_PROTOTYPES (nisplus)
 
 #undef DECLARE_NSS_PROTOTYPES
+#endif
 
 #endif
diff --git a/include/regex.h b/include/regex.h
index a7606c5e0d..fd4beeff3d 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -1,6 +1,7 @@
 #ifndef _REGEX_H
 #include <posix/regex.h>
 
+#ifndef _ISOMAC
 /* Document internal interfaces.  */
 extern reg_syntax_t __re_set_syntax (reg_syntax_t syntax);
 
@@ -41,3 +42,4 @@ extern size_t __regerror (int __errcode, const regex_t *__preg,
 
 extern void __regfree (regex_t *__preg);
 #endif
+#endif
diff --git a/include/sched.h b/include/sched.h
index 1eae9f72ff..4f59397090 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -1,6 +1,7 @@
 #ifndef _SCHED_H
 #include <posix/sched.h>
 
+#ifndef _ISOMAC
 /* Now define the internal interfaces.  */
 extern int __sched_setparam (__pid_t __pid,
 			     const struct sched_param *__param);
@@ -21,3 +22,4 @@ extern int __clone (int (*__fn) (void *__arg), void *__child_stack,
 extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base,
 		     size_t __child_stack_size, int __flags, void *__arg, ...);
 #endif
+#endif
diff --git a/include/search.h b/include/search.h
index d1f3a92e83..cf9c343708 100644
--- a/include/search.h
+++ b/include/search.h
@@ -1,6 +1,7 @@
 #ifndef _SEARCH_H
 #include <misc/search.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (hcreate_r)
 libc_hidden_proto (hdestroy_r)
 libc_hidden_proto (hsearch_r)
@@ -17,3 +18,4 @@ extern void *__tdelete (const void *__key, void **__rootp,
 extern void __twalk (const void *__root, __action_fn_t action);
 extern void __tdestroy (void *__root, __free_fn_t freefct);
 #endif
+#endif
diff --git a/include/setjmp.h b/include/setjmp.h
index 6863f51c11..622bb319f3 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -1,6 +1,7 @@
 #ifndef _SETJMP_H
 #include <setjmp/setjmp.h>
 
+#ifndef _ISOMAC
 /* Now define the internal interfaces.  */
 
 /* Internal machine-dependent function to restore context sans signal mask.  */