diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-01-14 16:07:58 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-01-14 16:07:58 -0800 |
| commit | c589e093e17a46c659a79f09d766f301ef8ef64f (patch) | |
| tree | 1e01c8ec36e7350b77c6f0d7dcccb50d7cd109f2 | |
| parent | 402cd98775db1478f64c9b0dbe00664b89eb2773 (diff) | |
| download | glibc-c589e093e17a46c659a79f09d766f301ef8ef64f.tar.gz glibc-c589e093e17a46c659a79f09d766f301ef8ef64f.tar.xz glibc-c589e093e17a46c659a79f09d766f301ef8ef64f.zip | |
elax some conditions in stdlib.h.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | stdlib/stdlib.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 518cdc7789..9b078a0236 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2010-01-14 Ulrich Drepper <drepper@redhat.com> + * stdlib/stdlib.h: Relax conditions for *cvt functions and valloc. + * Versions.def: Add GLIBC_2.12 for libpthread. [BZ #11126] diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 248aa33471..d1f3841f1b 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -497,8 +497,8 @@ extern void cfree (void *__ptr) __THROW; # include <alloca.h> #endif /* Use GNU, BSD, or misc. */ -#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED) \ - && !defined __USE_XOPEN2K) || defined __USE_GNU +#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \ + || defined __USE_BSD /* Allocate SIZE bytes on a page boundary. The storage cannot be freed. */ extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur; #endif @@ -797,8 +797,8 @@ __END_NAMESPACE_C99 #endif -#if ((defined __USE_SVID || defined __USE_XOPEN_EXTENDED) \ - && !defined __USE_XOPEN2K) || defined __USE_GNU +#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \ + || defined __USE_SVID /* Convert floating point numbers to strings. The returned values are valid only until another call to the same function. */ |