hurd: Fix hurd installed headers test

	* sysdeps/hurd/include/hurd.h [!_ISOMAC]: Do not declare libc hidden
	prototypes.
	* sysdeps/hurd/include/hurd/fd.h [!_ISOMAC]: Likewise.
	* sysdeps/hurd/include/hurd/signal.h [!_ISOMAC]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 253f98332b4443b1ad0db320cd147cdc55ec7b3b..e2ccfc91fe135ab678917f207f74e2b0cc4d14f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,10 @@
        [__USE_XOPEN] (OFDEL): New macro.
        [__USE_XOPEN && !__USE_XOPEN2K] (XCASE): New macro.
        * bits/resource.h (RLIM_SAVED_MAX, RLIM_SAVED_CUR): New macros.
+       * sysdeps/hurd/include/hurd.h [!_ISOMAC]: Do not declare libc hidden
+       prototypes.
+       * sysdeps/hurd/include/hurd/fd.h [!_ISOMAC]: Likewise.
+       * sysdeps/hurd/include/hurd/signal.h [!_ISOMAC]: Likewise.
 
 2018-04-18  Joseph Myers  <joseph@codesourcery.com>
 

diff --git a/sysdeps/hurd/include/hurd.h b/sysdeps/hurd/include/hurd.h
index f740e9de0fee5827b88fcbf3cb92f9fb51fc5e51..d29f580d5b89bac93607c6609721a9ebcc134f2e 100644 (file)
--- a/sysdeps/hurd/include/hurd.h
+++ b/sysdeps/hurd/include/hurd.h
@@ -1,5 +1,7 @@
 #ifndef        _HURD_H
 #include_next <hurd.h>
+#ifndef _ISOMAC
 libc_hidden_proto (_hurd_exec_paths)
 libc_hidden_proto (_hurd_init)
 #endif
+#endif

diff --git a/sysdeps/hurd/include/hurd/fd.h b/sysdeps/hurd/include/hurd/fd.h
index 643454f3f846e45faa762aee98b344d7a1f0041e..1f3ac380a0551294953dc46ca1f738bf3da2d210 100644 (file)
--- a/sysdeps/hurd/include/hurd/fd.h
+++ b/sysdeps/hurd/include/hurd/fd.h
@@ -1,10 +1,12 @@
 #ifndef        _HURD_FD_H
 #include_next <hurd/fd.h>
+#ifndef _ISOMAC
 libc_hidden_proto (_hurd_intern_fd)
 libc_hidden_proto (_hurd_fd_error)
 libc_hidden_proto (_hurd_fd_error_signal)
-#ifdef _HURD_FD_H_HIDDEN_DEF
+#  ifdef _HURD_FD_H_HIDDEN_DEF
 libc_hidden_def (_hurd_fd_error)
 libc_hidden_def (_hurd_fd_error_signal)
+#  endif
 #endif
 #endif

diff --git a/sysdeps/hurd/include/hurd/signal.h b/sysdeps/hurd/include/hurd/signal.h
index f3185f97dbecca35cb2a73eee76c13eab625e05c..1cb0adaa55fe153bcd2cb1051f47daf351372fb0 100644 (file)
--- a/sysdeps/hurd/include/hurd/signal.h
+++ b/sysdeps/hurd/include/hurd/signal.h
@@ -1,7 +1,9 @@
 #ifndef        _HURD_SIGNAL_H
 #include_next <hurd/signal.h>
+#ifndef _ISOMAC
 libc_hidden_proto (_hurd_exception2signal)
 libc_hidden_proto (_hurd_intr_rpc_mach_msg)
 libc_hidden_proto (_hurd_thread_sigstate)
 libc_hidden_proto (_hurd_raise_signal)
 #endif
+#endif