Fix using inlines in libc

4 files changed, 39 insertions, 13 deletions

diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
index 34bd8a95b8..da8a434809 100644
--- a/hurd/hurd/fd.h
+++ b/hurd/hurd/fd.h
@@ -60,7 +60,8 @@ 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 && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_FD_H_EXTERN_INLINE struct hurd_fd *
 _hurd_fd_get (int fd)
 {
@@ -93,6 +94,7 @@ _hurd_fd_get (int fd)
 
   return descriptor;
 }
+#  endif
 #endif
 
 
diff --git a/hurd/hurd/port.h b/hurd/hurd/port.h
index 0825f2b1ac..3e408bdb01 100644
--- a/hurd/hurd/port.h
+++ b/hurd/hurd/port.h
@@ -62,7 +62,8 @@ struct hurd_port
 
 void _hurd_port_init (struct hurd_port *port, mach_port_t init);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_init (struct hurd_port *port, mach_port_t init)
 {
@@ -70,6 +71,7 @@ _hurd_port_init (struct hurd_port *port, mach_port_t init)
   port->users = NULL;
   port->port = init;
 }
+#  endif
 #endif
 
 
@@ -83,7 +85,8 @@ mach_port_t
 _hurd_port_locked_get (struct hurd_port *port,
 		       struct hurd_userlink *link);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE mach_port_t
 _hurd_port_locked_get (struct hurd_port *port,
 		       struct hurd_userlink *link)
@@ -99,6 +102,7 @@ _hurd_port_locked_get (struct hurd_port *port,
   __spin_unlock (&port->lock);
   return result;
 }
+#  endif
 #endif
 
 /* Same, but locks PORT first.  */
@@ -107,7 +111,8 @@ mach_port_t
 _hurd_port_get (struct hurd_port *port,
 		struct hurd_userlink *link);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE mach_port_t
 _hurd_port_get (struct hurd_port *port,
 		struct hurd_userlink *link)
@@ -119,6 +124,7 @@ _hurd_port_get (struct hurd_port *port,
   HURD_CRITICAL_END;
   return result;
 }
+#  endif
 #endif
 
 
@@ -129,7 +135,8 @@ _hurd_port_free (struct hurd_port *port,
 		 struct hurd_userlink *link,
 		 mach_port_t used_port);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_free (struct hurd_port *port,
 		 struct hurd_userlink *link,
@@ -149,6 +156,7 @@ _hurd_port_free (struct hurd_port *port,
   if (dealloc)
     __mach_port_deallocate (__mach_task_self (), used_port);
 }
+#  endif
 #endif
 
 
@@ -157,7 +165,8 @@ _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 && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport)
 {
@@ -168,13 +177,15 @@ _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport)
   if (old != MACH_PORT_NULL)
     __mach_port_deallocate (__mach_task_self (), old);
 }
+#  endif
 #endif
 
 /* Same, but locks PORT first.  */
 
 void _hurd_port_set (struct hurd_port *port, mach_port_t newport);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_set (struct hurd_port *port, mach_port_t newport)
 {
@@ -183,6 +194,7 @@ _hurd_port_set (struct hurd_port *port, mach_port_t newport)
   _hurd_port_locked_set (port, newport);
   HURD_CRITICAL_END;
 }
+#  endif
 #endif
 
 
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
index 8d43f6cf5b..9c28aaa446 100644
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
@@ -129,7 +129,8 @@ extern struct hurd_sigstate *_hurd_self_sigstate (void)
 #define _HURD_SIGNAL_H_EXTERN_INLINE __extern_inline
 #endif
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate *
 _hurd_self_sigstate (void)
 {
@@ -139,6 +140,7 @@ _hurd_self_sigstate (void)
     *location = _hurd_thread_sigstate (__mach_thread_self ());
   return *location;
 }
+#  endif
 #endif
 
 /* Thread listening on our message port; also called the "signal thread".  */
@@ -168,7 +170,8 @@ extern int _hurd_core_limit;
 
 void *_hurd_critical_section_lock (void);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_SIGNAL_H_EXTERN_INLINE void *
 _hurd_critical_section_lock (void)
 {
@@ -193,11 +196,13 @@ _hurd_critical_section_lock (void)
      _hurd_critical_section_unlock to unlock it.  */
   return ss;
 }
+#  endif
 #endif
 
 void _hurd_critical_section_unlock (void *our_lock);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_SIGNAL_H_EXTERN_INLINE void
 _hurd_critical_section_unlock (void *our_lock)
 {
@@ -220,6 +225,7 @@ _hurd_critical_section_unlock (void *our_lock)
 	__msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ());
     }
 }
+#  endif
 #endif
 
 /* Convenient macros for simple uses of critical sections.
diff --git a/hurd/hurd/userlink.h b/hurd/hurd/userlink.h
index 9d43d3c057..07b62f55b7 100644
--- a/hurd/hurd/userlink.h
+++ b/hurd/hurd/userlink.h
@@ -80,7 +80,8 @@ void
 _hurd_userlink_link (struct hurd_userlink **chainp,
 		     struct hurd_userlink *link);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_USERLINK_H_EXTERN_INLINE void
 _hurd_userlink_link (struct hurd_userlink **chainp,
 		     struct hurd_userlink *link)
@@ -101,6 +102,7 @@ _hurd_userlink_link (struct hurd_userlink **chainp,
   link->thread.prevp = thread_chainp;
   *thread_chainp = link;
 }
+#  endif
 #endif
 
 
@@ -109,7 +111,8 @@ _hurd_userlink_link (struct hurd_userlink **chainp,
 
 int _hurd_userlink_unlink (struct hurd_userlink *link);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_USERLINK_H_EXTERN_INLINE int
 _hurd_userlink_unlink (struct hurd_userlink *link)
 {
@@ -132,6 +135,7 @@ _hurd_userlink_unlink (struct hurd_userlink *link)
 
   return dealloc;
 }
+#  endif
 #endif
 
 
@@ -143,7 +147,8 @@ _hurd_userlink_unlink (struct hurd_userlink *link)
 
 int _hurd_userlink_clear (struct hurd_userlink **chainp);
 
-#if defined __USE_EXTERN_INLINES && defined _LIBC && !defined NOT_IN_libc
+#if defined __USE_EXTERN_INLINES && defined _LIBC
+#  if IS_IN (libc)
 _HURD_USERLINK_H_EXTERN_INLINE int
 _hurd_userlink_clear (struct hurd_userlink **chainp)
 {
@@ -156,6 +161,7 @@ _hurd_userlink_clear (struct hurd_userlink **chainp)
   *chainp = NULL;
   return 0;
 }
+#  endif
 #endif
 
 #endif	/* hurd/userlink.h */