hurd: Fix installed-headers tests

	* sysdeps/mach/include/mach-shortcuts-hidden.h [!_ISOMAC]: Do not
	declare libc hidden prototypes.
	* sysdeps/mach/include/mach/mach_traps.h [!_ISOMAC]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 93cc5f4e0aaf92e9344af0bf1b0525f9b6951e03..ace34c0a81422cf817dace52523a4e3bf59c5a90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        * sysdeps/mach/hurd/i386/tls.h (_hurd_tls_init): Set multiple_threads
        to 1.
+       * sysdeps/hurd/include/hurd/port.h [!_ISOMAC]: Do not declare libc
+       hidden prototypes.
+       * sysdeps/mach/include/mach-shortcuts-hidden.h [!_ISOMAC]: Likewise.
+       * sysdeps/mach/include/mach/mach_traps.h [!_ISOMAC]: Likewise.
 
 2018-07-20  Thomas Schwinge  <tschwinge@gnu.org>
 

diff --git a/sysdeps/hurd/include/hurd/port.h b/sysdeps/hurd/include/hurd/port.h
index 84582f6d022b390a021ee7e49f56993ca7a12a38..ca1d2d111aa613918ef82b69d001183ac1eab449 100644 (file)
--- a/sysdeps/hurd/include/hurd/port.h
+++ b/sysdeps/hurd/include/hurd/port.h
@@ -1,5 +1,6 @@
 #ifndef        _HURD_PORT_H
 #include_next <hurd/port.h>
+#ifndef _ISOMAC
 libc_hidden_proto (_hurd_port_locked_get)
 libc_hidden_proto (_hurd_port_locked_set)
 #ifdef _HURD_PORT_H_HIDDEN_DEF
@@ -7,3 +8,4 @@ libc_hidden_def (_hurd_port_locked_get)
 libc_hidden_def (_hurd_port_locked_set)
 #endif
 #endif
+#endif

diff --git a/sysdeps/mach/include/mach-shortcuts-hidden.h b/sysdeps/mach/include/mach-shortcuts-hidden.h
index 0942871f267ee81449caf32d99706ebe467fb05e..f0ab8804ca6aa8e2f8b042e9b454b1637d666b32 100644 (file)
--- a/sysdeps/mach/include/mach-shortcuts-hidden.h
+++ b/sysdeps/mach/include/mach-shortcuts-hidden.h
@@ -1,4 +1,5 @@
 #include <mach-shortcuts.h>
+#ifndef _ISOMAC
 libc_hidden_proto (__task_create)
 libc_hidden_proto (__task_terminate)
 libc_hidden_proto (__vm_allocate)
@@ -11,3 +12,4 @@ libc_hidden_proto (__mach_port_allocate_name)
 libc_hidden_proto (__mach_port_allocate)
 libc_hidden_proto (__mach_port_deallocate)
 libc_hidden_proto (__mach_port_insert_right)
+#endif

diff --git a/sysdeps/mach/include/mach/mach_traps.h b/sysdeps/mach/include/mach/mach_traps.h
index 2d4c1f9c5fcd5fb5c83cfd540527da59e6fecc37..c43349524dafdf8639c82d9e233ba327b0cb6e7d 100644 (file)
--- a/sysdeps/mach/include/mach/mach_traps.h
+++ b/sysdeps/mach/include/mach/mach_traps.h
@@ -1,6 +1,7 @@
 #ifndef _MACH_MACH_TRAPS_H
 #include_next <mach/mach_traps.h>
 
+#ifndef _ISOMAC
 extern mach_port_t __mach_reply_port (void);
 libc_hidden_proto (__mach_reply_port)
 extern mach_port_t __mach_thread_self (void);
@@ -19,3 +20,4 @@ libc_hidden_proto (__thread_switch)
 kern_return_t __evc_wait (unsigned int event);
 libc_hidden_proto (__evc_wait)
 #endif
+#endif