From: Bruno Haible <bruno@clisp.org>
Date: Fri, 1 Aug 2003 16:28:51 +0000 (+0000)
Subject: Fix compilation error on Linux/libc5.
X-Git-Tag: v0.13~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45cbcff8812c2456601a5f495de7a90e7d987490;p=thirdparty%2Fgettext.git

Fix compilation error on Linux/libc5.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 076bf19c0..fd06b4ed7 100644
--- 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 63d205cb9..fa5e5f3ea 100644
--- 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 04cb7dedf..305d332e7 100644
--- 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 63d205cb9..fa5e5f3ea 100644
--- 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.  */