summaryrefslogtreecommitdiff
path: root/libc/conform/data/stdlib.h-data
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-11-09 22:50:35 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-11-09 22:50:35 +0000
commit5134213014448b459864d05ba6f556344c7b079f (patch)
tree95c6888a9704245ace6cfe82a457bc01b6bc1a6e /libc/conform/data/stdlib.h-data
parent5c8ae23aecdb14ee22ba06684c488cfe0306ff0e (diff)
downloadeglibc2-5134213014448b459864d05ba6f556344c7b079f.tar.gz
Merge changes between r21563 and r21628 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@21629 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/conform/data/stdlib.h-data')
-rw-r--r--libc/conform/data/stdlib.h-data4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/conform/data/stdlib.h-data b/libc/conform/data/stdlib.h-data
index 0b8dc3d12..382fff66b 100644
--- a/libc/conform/data/stdlib.h-data
+++ b/libc/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