From c5896a459543725dbca49ee894fd85b2f105ce6f Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Fri, 20 Apr 2018 00:54:18 +0200 Subject: Revert "hurd: Fix mach installed headers test" This reverts commit d4379e0216d01fd1395b1f3b37255e3486760135: the proper headers are actually already getting installed. --- ChangeLog | 12 ++++-------- include/lock-intern.h | 14 -------------- include/mach.h | 6 ------ include/mach/mig_support.h | 8 -------- include/mach_error.h | 6 ------ sysdeps/mach/include/lock-intern.h | 14 ++++++++++++++ sysdeps/mach/include/mach.h | 6 ++++++ sysdeps/mach/include/mach/mig_support.h | 8 ++++++++ sysdeps/mach/include/mach_error.h | 6 ++++++ 9 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 include/lock-intern.h delete mode 100644 include/mach.h delete mode 100644 include/mach/mig_support.h delete mode 100644 include/mach_error.h create mode 100644 sysdeps/mach/include/lock-intern.h create mode 100644 sysdeps/mach/include/mach.h create mode 100644 sysdeps/mach/include/mach/mig_support.h create mode 100644 sysdeps/mach/include/mach_error.h diff --git a/ChangeLog b/ChangeLog index 58f02e9..1eb5158 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,15 +103,11 @@ 2018-04-18 Samuel Thibault * conform/data/sys/un.h-data: Allow sun_ prefix. - * 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/. - * include/lock-intern.h [!_ISOMAC]: Do not declare libc hidden + * sysdeps/mach/include/lock-intern.h: Do not declare libc hidden prototypes. - * include/mach.h [!_ISOMAC]: Likewise. - * include/mach/mig_support.h [!_ISOMAC]: Likewise. - * include/mach_error.h [!_ISOMAC]: Likewise. + * sysdeps/mach/include/mach.h: Likewise. + * sysdeps/mach/include/mach/mig_support.h: Likewise. + * sysdeps/mach/include/mach_error.h: Likewise. 2018-04-16 Adhemerval Zanella diff --git a/include/lock-intern.h b/include/lock-intern.h deleted file mode 100644 index e42ad17..0000000 --- a/include/lock-intern.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _LOCK_INTERN_H -#include -#ifndef _ISOMAC -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 -#endif diff --git a/include/mach.h b/include/mach.h deleted file mode 100644 index b4c2f45..0000000 --- a/include/mach.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _MACH_H -#include_next -#ifndef _ISOMAC -libc_hidden_proto (__mach_msg_destroy) -#endif -#endif diff --git a/include/mach/mig_support.h b/include/mach/mig_support.h deleted file mode 100644 index b027237..0000000 --- a/include/mach/mig_support.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _MACH_MIG_SUPPORT_H -#include_next -#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 deleted file mode 100644 index de1c4ca..0000000 --- a/include/mach_error.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _MACH_ERROR_ -#include_next -#ifndef _ISOMAC -libc_hidden_proto (mach_error_type) -#endif -#endif diff --git a/sysdeps/mach/include/lock-intern.h b/sysdeps/mach/include/lock-intern.h new file mode 100644 index 0000000..e42ad17 --- /dev/null +++ b/sysdeps/mach/include/lock-intern.h @@ -0,0 +1,14 @@ +#ifndef _LOCK_INTERN_H +#include +#ifndef _ISOMAC +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 +#endif diff --git a/sysdeps/mach/include/mach.h b/sysdeps/mach/include/mach.h new file mode 100644 index 0000000..b4c2f45 --- /dev/null +++ b/sysdeps/mach/include/mach.h @@ -0,0 +1,6 @@ +#ifndef _MACH_H +#include_next +#ifndef _ISOMAC +libc_hidden_proto (__mach_msg_destroy) +#endif +#endif diff --git a/sysdeps/mach/include/mach/mig_support.h b/sysdeps/mach/include/mach/mig_support.h new file mode 100644 index 0000000..b027237 --- /dev/null +++ b/sysdeps/mach/include/mach/mig_support.h @@ -0,0 +1,8 @@ +#ifndef _MACH_MIG_SUPPORT_H +#include_next +#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/sysdeps/mach/include/mach_error.h b/sysdeps/mach/include/mach_error.h new file mode 100644 index 0000000..de1c4ca --- /dev/null +++ b/sysdeps/mach/include/mach_error.h @@ -0,0 +1,6 @@ +#ifndef _MACH_ERROR_ +#include_next +#ifndef _ISOMAC +libc_hidden_proto (mach_error_type) +#endif +#endif -- cgit v1.1