From c4375964dbf8194375a351b0d34ad9be5d4bda3b Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 18 Apr 2018 02:07:17 +0200 Subject: hurd: Fix spurious installation of headers defining hidden prototypes * sysdeps/mach/include/lock-intern.h: Move to include/. * 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/. --- ChangeLog | 4 ++++ include/lock-intern.h | 12 ++++++++++++ include/mach.h | 4 ++++ include/mach/mig_support.h | 6 ++++++ include/mach_error.h | 4 ++++ sysdeps/mach/include/lock-intern.h | 12 ------------ sysdeps/mach/include/mach.h | 4 ---- sysdeps/mach/include/mach/mig_support.h | 6 ------ sysdeps/mach/include/mach_error.h | 4 ---- 9 files changed, 30 insertions(+), 26 deletions(-) create mode 100644 include/lock-intern.h create mode 100644 include/mach.h create mode 100644 include/mach/mig_support.h create mode 100644 include/mach_error.h delete mode 100644 sysdeps/mach/include/lock-intern.h delete mode 100644 sysdeps/mach/include/mach.h delete mode 100644 sysdeps/mach/include/mach/mig_support.h delete mode 100644 sysdeps/mach/include/mach_error.h diff --git a/ChangeLog b/ChangeLog index cde575fbb1..ff34f13368 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ * conform/data/sys/un.h-data (struct sockaddr_un): Allow sun_len member. + * sysdeps/mach/include/lock-intern.h: Move to include/. + * 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/. 2018-04-16 Adhemerval Zanella diff --git a/include/lock-intern.h b/include/lock-intern.h new file mode 100644 index 0000000000..d0767ab37b --- /dev/null +++ b/include/lock-intern.h @@ -0,0 +1,12 @@ +#ifndef _LOCK_INTERN_H +#include +libc_hidden_proto (__spin_lock_locked) +libc_hidden_proto (__spin_lock) +libc_hidden_proto (__spin_lock_solid) +libc_hidden_proto (__spin_unlock) +libc_hidden_proto (__spin_try_lock) +libc_hidden_proto (__mutex_init) +libc_hidden_proto (__mutex_lock) +libc_hidden_proto (__mutex_unlock) +libc_hidden_proto (__mutex_trylock) +#endif diff --git a/include/mach.h b/include/mach.h new file mode 100644 index 0000000000..1f77100b6e --- /dev/null +++ b/include/mach.h @@ -0,0 +1,4 @@ +#ifndef _MACH_H +#include_next +libc_hidden_proto (__mach_msg_destroy) +#endif diff --git a/include/mach/mig_support.h b/include/mach/mig_support.h new file mode 100644 index 0000000000..7b9015d7e7 --- /dev/null +++ b/include/mach/mig_support.h @@ -0,0 +1,6 @@ +#ifndef _MACH_MIG_SUPPORT_H +#include_next +libc_hidden_proto (__mig_get_reply_port) +libc_hidden_proto (__mig_dealloc_reply_port) +libc_hidden_proto (__mig_init) +#endif diff --git a/include/mach_error.h b/include/mach_error.h new file mode 100644 index 0000000000..91463eb672 --- /dev/null +++ b/include/mach_error.h @@ -0,0 +1,4 @@ +#ifndef _MACH_ERROR_ +#include_next +libc_hidden_proto (mach_error_type) +#endif diff --git a/sysdeps/mach/include/lock-intern.h b/sysdeps/mach/include/lock-intern.h deleted file mode 100644 index d0767ab37b..0000000000 --- a/sysdeps/mach/include/lock-intern.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef _LOCK_INTERN_H -#include -libc_hidden_proto (__spin_lock_locked) -libc_hidden_proto (__spin_lock) -libc_hidden_proto (__spin_lock_solid) -libc_hidden_proto (__spin_unlock) -libc_hidden_proto (__spin_try_lock) -libc_hidden_proto (__mutex_init) -libc_hidden_proto (__mutex_lock) -libc_hidden_proto (__mutex_unlock) -libc_hidden_proto (__mutex_trylock) -#endif diff --git a/sysdeps/mach/include/mach.h b/sysdeps/mach/include/mach.h deleted file mode 100644 index 1f77100b6e..0000000000 --- a/sysdeps/mach/include/mach.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _MACH_H -#include_next -libc_hidden_proto (__mach_msg_destroy) -#endif diff --git a/sysdeps/mach/include/mach/mig_support.h b/sysdeps/mach/include/mach/mig_support.h deleted file mode 100644 index 7b9015d7e7..0000000000 --- a/sysdeps/mach/include/mach/mig_support.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _MACH_MIG_SUPPORT_H -#include_next -libc_hidden_proto (__mig_get_reply_port) -libc_hidden_proto (__mig_dealloc_reply_port) -libc_hidden_proto (__mig_init) -#endif diff --git a/sysdeps/mach/include/mach_error.h b/sysdeps/mach/include/mach_error.h deleted file mode 100644 index 91463eb672..0000000000 --- a/sysdeps/mach/include/mach_error.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _MACH_ERROR_ -#include_next -libc_hidden_proto (mach_error_type) -#endif -- cgit v1.2.3