diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-11-07 19:41:38 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-11-07 19:41:38 +0000 |
| commit | cbe6e12006557983c2aa00190d25c30330b8b2bf (patch) | |
| tree | 301038064df3e103b8d1ac1125ed7471851552b4 | |
| parent | 1b1264433382dd06d6fb7fa80a822f62ab6076fe (diff) | |
| download | glibc-cbe6e12006557983c2aa00190d25c30330b8b2bf.tar.gz glibc-cbe6e12006557983c2aa00190d25c30330b8b2bf.tar.xz glibc-cbe6e12006557983c2aa00190d25c30330b8b2bf.zip | |
conformtest: Fix setenv / unsetenv expectations.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | conform/data/stdlib.h-data | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 78ce23df04..379daee9f2 100644 --- 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 0b8dc3d126..382fff66ba 100644 --- 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 |