This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[hurd,commited] 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.
---
 ChangeLog                          | 4 ++++
 sysdeps/hurd/include/hurd.h        | 2 ++
 sysdeps/hurd/include/hurd/fd.h     | 4 +++-
 sysdeps/hurd/include/hurd/signal.h | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 253f98332b..e2ccfc91fe 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 f740e9de0f..d29f580d5b 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 643454f3f8..1f3ac380a0 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 f3185f97db..1cb0adaa55 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
-- 
2.17.0


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]