conformtest: Fix setenv / unsetenv expectations.

diff --git a/ChangeLog b/ChangeLog
index 78ce23d..379daee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-11-07  Joseph Myers  <joseph@codesourcery.com>
 
+       * conform/data/stdlib.h-data [XPG3 || XPG4 || UNIX98] (setenv): Do
+       not expect.
+       [XPG3 || XPG4 || UNIX98] (unsetenv): Likewise.
+
        * conform/data/math.h-data [XPG3 || XPG4 || UNIX98] (isnan):
        Change function return type to int.
 

diff --git a/conform/data/stdlib.h-data b/conform/data/stdlib.h-data
index 0b8dc3d..382fff6 100644 (file)
--- a/conform/data/stdlib.h-data
+++ b/conform/data/stdlib.h-data
@@ -138,7 +138,7 @@ function {void*} realloc (void*, size_t)
 function {char*} realpath (const char*, char*)
 function {unsigned short int*} seed48 (unsigned short int[3])
 #endif
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 function int setenv (const char*, const char*, int)
 #endif
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
@@ -168,7 +168,7 @@ function int ttyslot (void)
 #if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
 function int unlockpt (int)
 #endif
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 function int unsetenv (const char*)
 #endif
 #if defined XPG3 || defined XPG4 || defined UNIX98