Merge commit 'refs/top-bases/t/tls-threadvar' into t/tls-threadvar

Conflicts:
	hurd/hurd/threadvar.h

4 files changed, 13 insertions, 13 deletions

diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
index cd8edccdc2..eaaa332050 100644
--- a/hurd/hurd/fd.h
+++ b/hurd/hurd/fd.h
@@ -60,7 +60,7 @@ extern struct mutex _hurd_dtable_lock; /* Locks those two variables.  */
 
 struct hurd_fd *_hurd_fd_get (int fd);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_FD_H_EXTERN_INLINE struct hurd_fd *
 _hurd_fd_get (int fd)
 {
diff --git a/hurd/hurd/port.h b/hurd/hurd/port.h
index ce55154364..810bb3171a 100644
--- a/hurd/hurd/port.h
+++ b/hurd/hurd/port.h
@@ -62,7 +62,7 @@ struct hurd_port
 
 void _hurd_port_init (struct hurd_port *port, mach_port_t init);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_init (struct hurd_port *port, mach_port_t init)
 {
@@ -83,7 +83,7 @@ mach_port_t
 _hurd_port_locked_get (struct hurd_port *port,
 		       struct hurd_userlink *link);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_PORT_H_EXTERN_INLINE mach_port_t
 _hurd_port_locked_get (struct hurd_port *port,
 		       struct hurd_userlink *link)
@@ -107,7 +107,7 @@ mach_port_t
 _hurd_port_get (struct hurd_port *port,
 		struct hurd_userlink *link);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_PORT_H_EXTERN_INLINE mach_port_t
 _hurd_port_get (struct hurd_port *port,
 		struct hurd_userlink *link)
@@ -129,7 +129,7 @@ _hurd_port_free (struct hurd_port *port,
 		 struct hurd_userlink *link,
 		 mach_port_t used_port);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_free (struct hurd_port *port,
 		 struct hurd_userlink *link,
@@ -157,7 +157,7 @@ _hurd_port_free (struct hurd_port *port,
 
 void _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport)
 {
@@ -174,7 +174,7 @@ _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport)
 
 void _hurd_port_set (struct hurd_port *port, mach_port_t newport);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_set (struct hurd_port *port, mach_port_t newport)
 {
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
index dcb7f2162b..7a56950023 100644
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
@@ -128,7 +128,7 @@ extern struct hurd_sigstate *_hurd_self_sigstate (void)
 #define _HURD_SIGNAL_H_EXTERN_INLINE __extern_inline
 #endif
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate *
 _hurd_self_sigstate (void)
 {
@@ -165,7 +165,7 @@ extern int _hurd_core_limit;
 
 void *_hurd_critical_section_lock (void);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_SIGNAL_H_EXTERN_INLINE void *
 _hurd_critical_section_lock (void)
 {
@@ -201,7 +201,7 @@ _hurd_critical_section_lock (void)
 
 void _hurd_critical_section_unlock (void *our_lock);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_SIGNAL_H_EXTERN_INLINE void
 _hurd_critical_section_unlock (void *our_lock)
 {
diff --git a/hurd/hurd/userlink.h b/hurd/hurd/userlink.h
index 4962f0cb65..bd0a8c2569 100644
--- a/hurd/hurd/userlink.h
+++ b/hurd/hurd/userlink.h
@@ -80,7 +80,7 @@ void
 _hurd_userlink_link (struct hurd_userlink **chainp,
 		     struct hurd_userlink *link);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_USERLINK_H_EXTERN_INLINE void
 _hurd_userlink_link (struct hurd_userlink **chainp,
 		     struct hurd_userlink *link)
@@ -109,7 +109,7 @@ _hurd_userlink_link (struct hurd_userlink **chainp,
 
 int _hurd_userlink_unlink (struct hurd_userlink *link);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_USERLINK_H_EXTERN_INLINE int
 _hurd_userlink_unlink (struct hurd_userlink *link)
 {
@@ -143,7 +143,7 @@ _hurd_userlink_unlink (struct hurd_userlink *link)
 
 int _hurd_userlink_clear (struct hurd_userlink **chainp);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
 _HURD_USERLINK_H_EXTERN_INLINE int
 _hurd_userlink_clear (struct hurd_userlink **chainp)
 {