From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 18 Apr 2018 22:42:14 +0000 (+0200)
Subject: hurd: Fix mach installed headers test
X-Git-Tag: glibc-2.28~350
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4379e0216d01fd1395b1f3b37255e3486760135;p=thirdparty%2Fglibc.git

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 772dbcf4799..dcf0b71d3c1 100644
--- 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 d0767ab37bd..e42ad17be26 100644
--- 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 1f77100b6eb..b4c2f452405 100644
--- 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 7b9015d7e70..b027237692a 100644
--- 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 91463eb6729..de1c4ca4fe6 100644
--- 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