Mercurial > hg > octave-nkf > gnulib-hg
changeset 8234:e488ab5dfa4f
Avoid conflicting types for 'unsetenv' on FreeBSD.
* lib/putenv.c (_unsetenv): Rename from "unsetenv", to avoid
conflicting with FreeBSD's (5.0 and 6.1) function declaration
in stdlib.h.
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Sun, 25 Feb 2007 00:47:36 +0000 |
| parents | c58cad59396b |
| children | 9f0b58cde63c |
| files | ChangeLog lib/putenv.c |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-02-25 Jim Meyering <jim@meyering.net> + + Avoid conflicting types for 'unsetenv' on FreeBSD. + * lib/putenv.c (_unsetenv): Rename from "unsetenv", to avoid + conflicting with FreeBSD's (5.0 and 6.1) function declaration + in stdlib.h. + 2007-02-24 Bruno Haible <bruno@clisp.org> * modules/isnanl-nolibm-tests: New file.
--- a/lib/putenv.c +++ b/lib/putenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003, 2004, 2005, 2006 +/* Copyright (C) 1991, 1994, 1997, 1998, 2000, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C @@ -57,7 +57,7 @@ #endif static int -unsetenv (const char *name) +_unsetenv (const char *name) { size_t len; char **ep; @@ -105,7 +105,7 @@ if (name_end == NULL) { /* Remove the variable from the environment. */ - return unsetenv (string); + return _unsetenv (string); } size = 0;