2001-08-21 Roland McGrath <roland@frob.com>

	* hurd/Versions (GLIBC_2.2.5): New set, define __hurd_fail here.
	* Versions.def (libc): Add GLIBC_2.2.5 set.
	* hurd/hurd.h (_HURD_H_EXTERN_INLINE): New macro.
	(__hurd_fail): Use that instead of _EXTERN_INLINE in decl.

diff --git a/Versions.def b/Versions.def
index e9fb5a2..aa4a492 100644 (file)
--- 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 3667f90..4b98917 100644 (file)
--- 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 2e078c1..077e5b1 100644 (file)
--- 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)