about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Versions.def1
-rw-r--r--hurd/Versions4
-rw-r--r--hurd/hurd.h6
3 files changed, 10 insertions, 1 deletions
diff --git a/Versions.def b/Versions.def
index e9fb5a2ea4..aa4a4926bf 100644
--- a/Versions.def
+++ b/Versions.def
@@ -13,6 +13,7 @@ libc {
   GLIBC_2.2.2
   GLIBC_2.2.3
   GLIBC_2.2.4
+  GLIBC_2.2.5
 %ifdef USE_IN_LIBIO
   HURD_CTHREADS_0.3
 %endif
diff --git a/hurd/Versions b/hurd/Versions
index 3667f90dd1..4b98917491 100644
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -135,6 +135,10 @@ libc {
     # h*
     hurd_directory_name_split;
   }
+  GLIBC_2.2.5 {
+    # This always existed as an inline but the real function never exported.
+    __hurd_fail;
+  }
 
 %if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
   HURD_CTHREADS_0.3 {
diff --git a/hurd/hurd.h b/hurd/hurd.h
index 2e078c1966..077e5b191b 100644
--- a/hurd/hurd.h
+++ b/hurd/hurd.h
@@ -43,7 +43,11 @@
 
 #include <errno.h>
 
-_EXTERN_INLINE int
+#ifndef _HURD_H_EXTERN_INLINE
+#define _HURD_H_EXTERN_INLINE extern __inline
+#endif
+
+_HURD_H_EXTERN_INLINE int
 __hurd_fail (error_t err)
 {
   switch (err)