Fix compilation error on Linux/libc5.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 076bf19c0f93100ba60cc33adbc0cfdcc2f11202..fd06b4ed73abc4389e1aab659a68be294bc36f34 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-01  Bruno Haible  <bruno@clisp.org>
+
+       * relocatable.c (find_shared_library_fullname): Disable the code on
+       Linux/libc5. Reported by Alain Guibert <derogaton+bgli@oreka.com>.
+
 2003-06-27  Bruno Haible  <bruno@clisp.org>
 
        Avoid use of *_unlocked functions on Solaris 2.5.1.

diff --git a/gettext-runtime/intl/relocatable.c b/gettext-runtime/intl/relocatable.c
index 63d205cb9e6f4810531609d922b965e6bdf67ac5..fa5e5f3eafcfc5597e00163fe151de88704e981a 100644 (file)
--- a/gettext-runtime/intl/relocatable.c
+++ b/gettext-runtime/intl/relocatable.c
@@ -313,7 +313,8 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
 static void
 find_shared_library_fullname ()
 {
-#ifdef __linux__
+#if defined __linux__ && __GLIBC__ >= 2
+  /* Linux has /proc/self/maps. glibc 2 has the getline() function.  */
   FILE *fp;
 
   /* Open the current process' maps file.  It describes one VMA per line.  */

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 04cb7dedfdecdc20f0830702a79045729d8d2151..305d332e71ff9ba80a52bc994405a7ce13ad045f 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-01  Bruno Haible  <bruno@clisp.org>
+
+       * relocatable.c (find_shared_library_fullname): Disable the code on
+       Linux/libc5. Reported by Alain Guibert <derogaton+bgli@oreka.com>.
+
 2003-07-09  Paul Eggert  <eggert@twinsun.com>
 
        * alloca_.h: Switch from LGPL to GPL.

diff --git a/gettext-tools/lib/relocatable.c b/gettext-tools/lib/relocatable.c
index 63d205cb9e6f4810531609d922b965e6bdf67ac5..fa5e5f3eafcfc5597e00163fe151de88704e981a 100644 (file)
--- a/gettext-tools/lib/relocatable.c
+++ b/gettext-tools/lib/relocatable.c
@@ -313,7 +313,8 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
 static void
 find_shared_library_fullname ()
 {
-#ifdef __linux__
+#if defined __linux__ && __GLIBC__ >= 2
+  /* Linux has /proc/self/maps. glibc 2 has the getline() function.  */
   FILE *fp;
 
   /* Open the current process' maps file.  It describes one VMA per line.  */