X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsetenv.h;h=c89e7da4d301f37f6bba541f3823c95163e4ebba;hb=ecbe47ca1c551b24c8a4d7309daba56006956849;hp=9068b70ff2320e6a223dec9a5e83db7ab2fc2799;hpb=bc3ce84648f24822d0b7022187e00437586c9ba3;p=gnulib.git

diff --git a/lib/setenv.h b/lib/setenv.h
index 9068b70ff..c89e7da4d 100644
--- a/lib/setenv.h
+++ b/lib/setenv.h
@@ -1,5 +1,5 @@
 /* Setting environment variables.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004 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
@@ -13,12 +13,12 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #if HAVE_SETENV || HAVE_UNSETENV
 
 /* Get setenv(), unsetenv() declarations.  */
-#include <stdlib.h>
+# include <stdlib.h>
 
 #endif
 
@@ -34,7 +34,15 @@ extern int setenv (const char *name, const char *value, int replace);
 
 #endif
 
-#if !HAVE_UNSETENV
+#if HAVE_UNSETENV
+
+# if VOID_UNSETENV
+/* On some systems, unsetenv() returns void.
+   This is the case for FreeBSD 4.8, NetBSD 1.6, OpenBSD 3.4.  */
+#  define unsetenv(name) ((unsetenv)(name), 0)
+# endif
+
+#else
 
 /* Remove the variable NAME from the environment.  */
 extern int unsetenv (const char *name);