Merge branch 't/extern_inline' into refs/top-bases/tschwinge/Roger_Whittaker

6 files changed, 18 insertions, 17 deletions

diff --git a/hurd/Versions b/hurd/Versions
index 42dadc2b82..bd5fd90806 100644
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -135,6 +135,7 @@ libc {
     # These always existed as inlines but the real functions were not exported.
     _hurd_fd_error_signal; _hurd_fd_error;
     __hurd_dfail; __hurd_sockfail;
+    _hurd_port_locked_set;
     __hurd_threadvar_location_from_sp;
     __hurd_threadvar_location;
     _hurd_userlink_link; _hurd_userlink_unlink; _hurd_userlink_clear;
diff --git a/hurd/hurd.h b/hurd/hurd.h
index 3d99c27ce5..19110a298b 100644
--- a/hurd/hurd.h
+++ b/hurd/hurd.h
@@ -46,7 +46,7 @@
 #define _HURD_H_EXTERN_INLINE __extern_inline
 #endif
 
-int __hurd_fail (error_t err);
+extern int __hurd_fail (error_t err);
 
 #ifdef __USE_EXTERN_INLINES
 _HURD_H_EXTERN_INLINE int
diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
index e75cb146fa..a4adc553ec 100644
--- a/hurd/hurd/fd.h
+++ b/hurd/hurd/fd.h
@@ -59,7 +59,7 @@ extern struct mutex _hurd_dtable_lock; /* Locks those two variables.  */
    NULL.  The cell is unlocked; when ready to use it, lock it and check for
    it being unused.  */
 
-struct hurd_fd *_hurd_fd_get (int fd);
+extern struct hurd_fd *_hurd_fd_get (int fd);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
 #  if IS_IN (libc)
@@ -144,7 +144,7 @@ _hurd_fd_get (int fd)
 /* Check if ERR should generate a signal.
    Returns the signal to take, or zero if none.  */
 
-int _hurd_fd_error_signal (error_t err);
+extern int _hurd_fd_error_signal (error_t err);
 
 #ifdef __USE_EXTERN_INLINES
 _HURD_FD_H_EXTERN_INLINE int
@@ -169,7 +169,7 @@ _hurd_fd_error_signal (error_t err)
    always use this function to handle errors from RPCs made on file
    descriptor ports.  Some errors are translated into signals.  */
 
-error_t _hurd_fd_error (int fd, error_t err);
+extern error_t _hurd_fd_error (int fd, error_t err);
 
 #ifdef __USE_EXTERN_INLINES
 _HURD_FD_H_EXTERN_INLINE error_t
@@ -189,7 +189,7 @@ _hurd_fd_error (int fd, error_t err)
 /* Handle error code ERR from an RPC on file descriptor FD's port.
    Set `errno' to the appropriate error code, and always return -1.  */
 
-int __hurd_dfail (int fd, error_t err);
+extern int __hurd_dfail (int fd, error_t err);
 
 #ifdef __USE_EXTERN_INLINES
 _HURD_FD_H_EXTERN_INLINE int
@@ -203,7 +203,7 @@ __hurd_dfail (int fd, error_t err)
 /* Likewise, but do not raise SIGPIPE on EPIPE if flags contain
    MSG_NOSIGNAL.  */
 
-int __hurd_sockfail (int fd, int flags, error_t err);
+exern int __hurd_sockfail (int fd, int flags, error_t err);
 
 #ifdef __USE_EXTERN_INLINES
 _HURD_FD_H_EXTERN_INLINE int
diff --git a/hurd/hurd/port.h b/hurd/hurd/port.h
index 8afee90e29..c82fa4f04c 100644
--- a/hurd/hurd/port.h
+++ b/hurd/hurd/port.h
@@ -60,7 +60,7 @@ struct hurd_port
 
 /* Initialize *PORT to INIT.  */
 
-void _hurd_port_init (struct hurd_port *port, mach_port_t init);
+extern void _hurd_port_init (struct hurd_port *port, mach_port_t init);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
 #  if IS_IN (libc)
@@ -81,7 +81,7 @@ extern void _hurd_port_cleanup (void *, jmp_buf, int);
 /* Get a reference to *PORT, which is locked.
    Pass return value and LINK to _hurd_port_free when done.  */
 
-mach_port_t
+extern mach_port_t
 _hurd_port_locked_get (struct hurd_port *port,
 		       struct hurd_userlink *link);
 
@@ -107,7 +107,7 @@ _hurd_port_locked_get (struct hurd_port *port,
 
 /* Same, but locks PORT first.  */
 
-mach_port_t
+extern mach_port_t
 _hurd_port_get (struct hurd_port *port,
 		struct hurd_userlink *link);
 
@@ -130,7 +130,7 @@ _hurd_port_get (struct hurd_port *port,
 
 /* Free a reference gotten with `USED_PORT = _hurd_port_get (PORT, LINK);' */
 
-void
+extern void
 _hurd_port_free (struct hurd_port *port,
 		 struct hurd_userlink *link,
 		 mach_port_t used_port);
@@ -163,7 +163,7 @@ _hurd_port_free (struct hurd_port *port,
 /* Set *PORT's port to NEWPORT.  NEWPORT's reference is consumed by PORT->port.
    PORT->lock is locked.  */
 
-void _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport);
+extern void _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
 #  if IS_IN (libc)
@@ -182,7 +182,7 @@ _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport)
 
 /* Same, but locks PORT first.  */
 
-void _hurd_port_set (struct hurd_port *port, mach_port_t newport);
+extern void _hurd_port_set (struct hurd_port *port, mach_port_t newport);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
 #  if IS_IN (libc)
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
index aad9ac44ce..971342c375 100644
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
@@ -194,7 +194,7 @@ extern int _hurd_core_limit;
    interrupted lest the signal handler try to take the same lock and
    deadlock result.  */
 
-void *_hurd_critical_section_lock (void);
+extern void *_hurd_critical_section_lock (void);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
 #  if IS_IN (libc)
@@ -236,7 +236,7 @@ _hurd_critical_section_lock (void)
 #  endif
 #endif
 
-void _hurd_critical_section_unlock (void *our_lock);
+extern void _hurd_critical_section_unlock (void *our_lock);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
 #  if IS_IN (libc)
diff --git a/hurd/hurd/userlink.h b/hurd/hurd/userlink.h
index d2610d7561..128ce59726 100644
--- a/hurd/hurd/userlink.h
+++ b/hurd/hurd/userlink.h
@@ -76,7 +76,7 @@ struct hurd_userlink
 
 /* Attach LINK to the chain of users at *CHAINP.  */
 
-void
+extern void
 _hurd_userlink_link (struct hurd_userlink **chainp,
 		     struct hurd_userlink *link);
 
@@ -109,7 +109,7 @@ _hurd_userlink_link (struct hurd_userlink **chainp,
 /* Detach LINK from its chain.  Returns nonzero iff this was the
    last user of the resource and it should be deallocated.  */
 
-int _hurd_userlink_unlink (struct hurd_userlink *link);
+extern int _hurd_userlink_unlink (struct hurd_userlink *link);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
 #  if IS_IN (libc)
@@ -145,7 +145,7 @@ _hurd_userlink_unlink (struct hurd_userlink *link)
    value is zero, someone is still using the resource and they will
    deallocate it when they are finished.  */
 
-int _hurd_userlink_clear (struct hurd_userlink **chainp);
+extern int _hurd_userlink_clear (struct hurd_userlink **chainp);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
 #  if IS_IN (libc)