hurd: Fix mach installed headers test

	* include/lock-intern.h [!_ISOMAC]: Do not declare libc hidden
	prototypes.
	* include/mach.h [!_ISOMAC]: Likewise.
	* include/mach/mig_support.h [!_ISOMAC]: Likewise.
	* include/mach_error.h [!_ISOMAC]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 772dbcf47993e8283804b1dff9553c1862ecde8c..dcf0b71d3c1be0539a6f35643e756e2b0b289c01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,11 @@
        * sysdeps/mach/include/mach.h: Move to include/.
        * sysdeps/mach/include/mach/mig_support.h: Move to include/mach/.
        * sysdeps/mach/include/mach_error.h: Move to include/.
+       * include/lock-intern.h [!_ISOMAC]: Do not declare libc hidden
+       prototypes.
+       * include/mach.h [!_ISOMAC]: Likewise.
+       * include/mach/mig_support.h [!_ISOMAC]: Likewise.
+       * include/mach_error.h [!_ISOMAC]: Likewise.
 
 2018-04-16  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 

diff --git a/include/lock-intern.h b/include/lock-intern.h
index d0767ab37bd0915684ad76134c21d9711b5f1a13..e42ad17be26d7bbfb2f6a2f2146d191379275ed0 100644 (file)
--- a/include/lock-intern.h
+++ b/include/lock-intern.h
@@ -1,5 +1,6 @@
 #ifndef _LOCK_INTERN_H
 #include <mach/lock-intern.h>
+#ifndef _ISOMAC
 libc_hidden_proto (__spin_lock_locked)
 libc_hidden_proto (__spin_lock)
 libc_hidden_proto (__spin_lock_solid)
@@ -10,3 +11,4 @@ libc_hidden_proto (__mutex_lock)
 libc_hidden_proto (__mutex_unlock)
 libc_hidden_proto (__mutex_trylock)
 #endif
+#endif

diff --git a/include/mach.h b/include/mach.h
index 1f77100b6ebcb3310ae2619dcd77485834293ced..b4c2f452405c950c5742e67e05dd0058fcdf3a79 100644 (file)
--- a/include/mach.h
+++ b/include/mach.h
@@ -1,4 +1,6 @@
 #ifndef        _MACH_H
 #include_next <mach.h>
+#ifndef _ISOMAC
 libc_hidden_proto (__mach_msg_destroy)
 #endif
+#endif

diff --git a/include/mach/mig_support.h b/include/mach/mig_support.h
index 7b9015d7e7002ed8d493ed9143d4d1cd59f3c05b..b027237692a1371cc8fcc3a1c93f84d7514104b1 100644 (file)
--- a/include/mach/mig_support.h
+++ b/include/mach/mig_support.h
@@ -1,6 +1,8 @@
 #ifndef _MACH_MIG_SUPPORT_H
 #include_next <mach/mig_support.h>
+#ifndef _ISOMAC
 libc_hidden_proto (__mig_get_reply_port)
 libc_hidden_proto (__mig_dealloc_reply_port)
 libc_hidden_proto (__mig_init)
 #endif
+#endif

diff --git a/include/mach_error.h b/include/mach_error.h
index 91463eb67299ff44a3ca2b36f0bb53d0fc4cbbdf..de1c4ca4fe6a195339afeb8a7189bb0cf9ad0113 100644 (file)
--- a/include/mach_error.h
+++ b/include/mach_error.h
@@ -1,4 +1,6 @@
 #ifndef        _MACH_ERROR_
 #include_next <mach_error.h>
+#ifndef _ISOMAC
 libc_hidden_proto (mach_error_type)
 #endif
+#endif