Use rpl_ prefix for functions, so as to avoid endless recursions in weird cases.

diff --git a/ChangeLog b/ChangeLog
index 84ef90fa450719fa37a7a052af406ac55897268b..3336f1bfddadccde4792a34465d686249b020143 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-16  Bruno Haible  <bruno@clisp.org>
+
+       * lib/getcwd.c (__getcwd): Define with explicit rpl_ prefix.
+       * lib/getgroups.c (getgroups): Likewise.
+       * lib/gettimeofday.c (localtime, gmtime, tzset): Likewise.
+
 2007-10-16  Bruno Haible  <bruno@clisp.org>
 
        * modules/absolute-header (License): Change from LGPL to LGPLv2+.

diff --git a/lib/getcwd.c b/lib/getcwd.c
index a185ef3c6b7cc7eee0b871f570fa0aaa27f8030f..b8e9989b9056942f5b3869b0b669ff18406b5260 100644 (file)
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -89,7 +89,7 @@
 #endif
 
 #if !_LIBC
-# define __getcwd getcwd
+# define __getcwd rpl_getcwd
 # define __lstat lstat
 # define __closedir closedir
 # define __opendir opendir

diff --git a/lib/getgroups.c b/lib/getgroups.c
index 68a5aa1496e2cf7fbfd68ac320c4b828cbafccef..a8a225a8f7f20a07c1ec384d0ab602215a111641 100644 (file)
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -1,6 +1,6 @@
 /* provide consistent interface to getgroups for systems that don't allow N==0
 
-   Copyright (C) 1996, 1999, 2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1999, 2003, 2006, 2007 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
    provided function handle all others. */
 
 int
-getgroups (int n, GETGROUPS_T *group)
+rpl_getgroups (int n, GETGROUPS_T *group)
 {
   int n_groups;
   GETGROUPS_T *gbuf;

diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index bd5576cb0993823f92f96a8f05b876cd78d6e771..f190c2dd53800f43906794812731ef2da57435a5 100644 (file)
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -48,7 +48,7 @@ static struct tm *localtime_buffer_addr = &tm_zero_buffer;
    localtime uses for its result.  */
 
 struct tm *
-localtime (time_t const *timep)
+rpl_localtime (time_t const *timep)
 {
 #undef localtime
   extern struct tm *localtime (time_t const *);
@@ -62,7 +62,7 @@ localtime (time_t const *timep)
 
 /* Same as above, since gmtime and localtime use the same buffer.  */
 struct tm *
-gmtime (time_t const *timep)
+rpl_gmtime (time_t const *timep)
 {
 #undef gmtime
   extern struct tm *gmtime (time_t const *);
@@ -80,7 +80,7 @@ gmtime (time_t const *timep)
 /* This is a wrapper for tzset, for systems on which tzset may clobber
    the static buffer used for localtime's result.  */
 void
-tzset (void)
+rpl_tzset (void)
 {
 #undef tzset
   extern void tzset (void);