From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 26 Nov 2004 07:16:57 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-glibc-20041126T1318~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90692538658ce0c42abacb0c053c7e88bc5d649d;p=thirdparty%2Fglibc.git

Update.

2004-11-26  Jakub Jelinek  <jakub@redhat.com>

	* stdlib/stdlib.h (setenv): Use nonnull only for second argument.
	(unsetenv): Remove.
---

diff --git a/ChangeLog b/ChangeLog
index 0267ce381b9..e04b490a6ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* stdlib/stdlib.h (setenv): Use nonnull only for second argument.
+	(unsetenv): Remove.
+
 2004-11-23  Paolo Bonzini  <bonzini@gnu.org>
 
 	* posix/regcomp.c (analyze_tree): Always call calc_epsdest.
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index e4f79369a6d..4ef32ac782f 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -669,10 +669,10 @@ extern int putenv (char *__string) __THROW __nonnull ((1));
 /* Set NAME to VALUE in the environment.
    If REPLACE is nonzero, overwrite an existing value.  */
 extern int setenv (__const char *__name, __const char *__value, int __replace)
-     __THROW __nonnull ((1, 2));
+     __THROW __nonnull ((2));
 
 /* Remove the variable NAME from the environment.  */
-extern int unsetenv (__const char *__name) __THROW __nonnull ((1));
+extern int unsetenv (__const char *__name) __THROW;
 #endif
 
 #ifdef	__USE_MISC