From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 19 Apr 2018 22:16:40 +0000 (+0200)
Subject: hurd: Fix hurd installed headers test
X-Git-Tag: glibc-2.28~335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dbfe13b35195cd1292b81787a0ef58db828c7d5;p=thirdparty%2Fglibc.git

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 253f98332b4..e2ccfc91fe1 100644
--- 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 f740e9de0fe..d29f580d5b8 100644
--- 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 643454f3f84..1f3ac380a05 100644
--- 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 f3185f97dbe..1cb0adaa55f 100644
--- 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