diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-08-23 14:55:51 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2009-09-18 17:40:54 +0200 |
| commit | bf1f1f4e4ab4bc44c2e3205d9d869b7c20a33d32 (patch) | |
| tree | ed48935e612a53e203d379d11c2e41c2c9776342 | |
| parent | 969cfcda4c6ed4a2eda59360946fa7e91883ad59 (diff) | |
| download | glibc-bf1f1f4e4ab4bc44c2e3205d9d869b7c20a33d32.tar.gz glibc-bf1f1f4e4ab4bc44c2e3205d9d869b7c20a33d32.tar.xz glibc-bf1f1f4e4ab4bc44c2e3205d9d869b7c20a33d32.zip | |
Also correct _POSIX2_* constants in case older standards are selected.
(cherry picked from commit bdc7f5d76b4f284475595dddc79f0e0f9720ec20)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | posix/unistd.h | 24 |
2 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 6b574a5af9..e7c80bea11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2009-08-23 Ulrich Drepper <drepper@redhat.com> - * posix/unistd.h: Define _POSIX_VERSION correctly if older POSIX - versions are selected. + * posix/unistd.h: Define _POSIX_VERSION and _POSIX2_* correctly if + older POSIX versions are selected. 2009-08-10 SUGIOKA Toshinobu <sugioka@itonet.co.jp> diff --git a/posix/unistd.h b/posix/unistd.h index 6f92c250ba..a487883eb8 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -50,24 +50,38 @@ __BEGIN_DECLS /* These are not #ifdef __USE_POSIX2 because they are in the theoretically application-owned namespace. */ +#ifdef __USE_XOPEN2K8 +# define __POSIX2_THIS_VERSION 200809L +/* The utilities on GNU systems also correspond to this version. */ +#elif defined __USE_XOPEN2K +/* The utilities on GNU systems also correspond to this version. */ +# define __POSIX2_THIS_VERSION 200112L +#elif defined __USE_POSIX199506 +/* The utilities on GNU systems also correspond to this version. */ +# define __POSIX2_THIS_VERSION 199506L +#else +/* The utilities on GNU systems also correspond to this version. */ +# define __POSIX2_THIS_VERSION 199209L +#endif + /* The utilities on GNU systems also correspond to this version. */ -#define _POSIX2_VERSION 200809L +#define _POSIX2_VERSION __POSIX2_THIS_VERSION /* If defined, the implementation supports the C Language Bindings Option. */ -#define _POSIX2_C_BIND 200809L +#define _POSIX2_C_BIND __POSIX2_THIS_VERSION /* If defined, the implementation supports the C Language Development Utilities Option. */ -#define _POSIX2_C_DEV 200809L +#define _POSIX2_C_DEV __POSIX2_THIS_VERSION /* If defined, the implementation supports the Software Development Utilities Option. */ -#define _POSIX2_SW_DEV 200809L +#define _POSIX2_SW_DEV __POSIX2_THIS_VERSION /* If defined, the implementation supports the creation of locales with the localedef utility. */ -#define _POSIX2_LOCALEDEF 200809L +#define _POSIX2_LOCALEDEF __POSIX2_THIS_VERSION /* X/Open version number to which the library conforms. It is selectable. */ #ifdef __USE_XOPEN2K8 |