# HG changeset patch # User Bruno Haible # Date 1192580447 -7200 # Node ID 20db465217b42c4c9f0b23bc3ef89265ef42f84e # Parent 970d5cb5b0030103d0a3c9a00ad1afc91a02c23e Use rpl_ prefix for functions, so as to avoid endless recursions in weird cases. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-16 Bruno Haible + + * 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 * modules/absolute-header (License): Change from LGPL to LGPLv2+. diff --git a/lib/getcwd.c b/lib/getcwd.c --- 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 --- 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 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -48,7 +48,7 @@ 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 @@ /* 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 @@ /* 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);