Mercurial > hg > octave-lojdl > gnulib-hg
changeset 9349:0c6048a8aaed
Use rpl_ prefix for functions, so as to avoid endless recursions in weird cases.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 15 Oct 2007 22:40:19 +0200 |
| parents | 8ffd013e225e |
| children | 4e234ce80517 |
| files | ChangeLog lib/fchdir.c lib/fopen.c lib/freopen.c lib/iconv.c lib/iconv_close.c |
| diffstat | 6 files changed, 21 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-10-15 Bruno Haible <bruno@clisp.org> + + * lib/fchdir.c (close, open, closedir, opendir, dup, dup2): Define + with explicit rpl_ prefix. + * lib/fopen.c (fopen): Likewise. + * lib/freopen.c (freopen): Likewise. + * lib/iconv.c (iconv): Likewise. + * lib/iconv_close.c (iconv_close): Likewise. + 2007-10-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * m4/iconv_open (gl_FUNC_ICONV_OPEN_UTF): Fix cache variable name.
--- a/lib/fchdir.c +++ b/lib/fchdir.c @@ -78,7 +78,7 @@ /* Override open() and close(), to keep track of the open file descriptors. */ int -close (int fd) +rpl_close (int fd) #undef close { int retval = close (fd); @@ -94,7 +94,7 @@ } int -open (const char *filename, int flags, ...) +rpl_open (const char *filename, int flags, ...) #undef open { mode_t mode; @@ -139,7 +139,7 @@ descriptors. Needed because there is a function dirfd(). */ int -closedir (DIR *dp) +rpl_closedir (DIR *dp) #undef closedir { int fd = dirfd (dp); @@ -156,7 +156,7 @@ } DIR * -opendir (const char *filename) +rpl_opendir (const char *filename) #undef opendir { DIR *dp; @@ -182,7 +182,7 @@ /* Override dup() and dup2(), to keep track of open file descriptors. */ int -dup (int oldfd) +rpl_dup (int oldfd) #undef dup { int newfd = dup (oldfd); @@ -217,7 +217,7 @@ } int -dup2 (int oldfd, int newfd) +rpl_dup2 (int oldfd, int newfd) #undef dup2 { int retval = dup2 (oldfd, newfd);
--- a/lib/fopen.c +++ b/lib/fopen.c @@ -24,7 +24,7 @@ #include <string.h> FILE * -fopen (const char *filename, const char *mode) +rpl_fopen (const char *filename, const char *mode) #undef fopen { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
--- a/lib/freopen.c +++ b/lib/freopen.c @@ -24,7 +24,7 @@ #include <string.h> FILE * -freopen (const char *filename, const char *mode, FILE *stream) +rpl_freopen (const char *filename, const char *mode, FILE *stream) #undef freopen { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
--- a/lib/iconv.c +++ b/lib/iconv.c @@ -275,9 +275,9 @@ #endif size_t -iconv (iconv_t cd, - ICONV_CONST char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft) +rpl_iconv (iconv_t cd, + ICONV_CONST char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft) #undef iconv { #if REPLACE_ICONV_UTF