Portability to Linux libc5.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index b3713c70ede7c8c64965a5daac22e5be45f02fee..29a0039c9239c5f9648ccc4fc33f72ee9ec97fa3 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-26  Bruno Haible  <bruno@clisp.org>
+
+       * basename.h: Use __GLIBC__ instead of __GNU_LIBRARY__, because
+       Linux libc5 doesn't declare basename() properly.
+       * basename.c: Likewise.
+
 2002-04-24  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.11.2 released.

diff --git a/lib/basename.c b/lib/basename.c
index 9a4f3400194ba637513dbdd553555e13db4307c5..c121364c86e26917d8628f2edc22c512b6f53efe 100644 (file)
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1996-1999, 2000-2002 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@gnu.org.
@@ -26,7 +26,7 @@
 /* Specification.  */
 #include "basename.h"
 
-#ifndef __GNU_LIBRARY__
+#ifndef __GLIBC__
 
 #include <stdio.h>
 #include <assert.h>

diff --git a/lib/basename.h b/lib/basename.h
index 6093e38924628504c0368ed4453203c5aac61c8a..617e0914a4c2632d2435e7cd94763046c2010f14 100644 (file)
--- a/lib/basename.h
+++ b/lib/basename.h
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 /* This is where basename() is declared.  */
 #include <string.h>
 
-#ifndef __GNU_LIBRARY__
+#ifndef __GLIBC__
 /* When not using the GNU libc we use the basename implementation we
    provide here.  */
 extern char *gnu_basename PARAMS ((const char *));