diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-03-07 20:54:03 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-03-07 20:54:03 +0000 |
| commit | bc61d27c616f517521826581f0401f5b81772a65 (patch) | |
| tree | 2938f06614c3121a13e9868c9876b27359c0c019 /posix | |
| parent | 302949e2940a9da3f6364a1574619e621b7e1e71 (diff) | |
| download | glibc-bc61d27c616f517521826581f0401f5b81772a65.tar.gz glibc-bc61d27c616f517521826581f0401f5b81772a65.tar.xz glibc-bc61d27c616f517521826581f0401f5b81772a65.zip | |
Include all of <time.h> from <sched.h> for older standards (bug 16670).
This patch fixes one of the header namespace issues shown up by conformtest, <sched.h> failing to expose all symbols from <time.h> as required by older standards. The patch keeps the existing behavior if __USE_XOPEN2K is defined (the default; POSIX.1-2001 was the version that made it optional to expose these symbols), but ensures that all the symbols from <time.h> are exposed if an older standard is selected. Tested x86_64. [BZ #16670] * posix/sched.h [!__USE_XOPEN2K] (__need_time_t): Don't define before #include of <time.h>. [!__USE_XOPEN2K] (__need_timespec): Likewise. * conform/Makefile (test-xfail-POSIX/sched.h/conform): Remove. (test-xfail-UNIX98/sched.h/conform): Likewise.
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/sched.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/posix/sched.h b/posix/sched.h index f7da2559f9..779109a2c7 100644 --- a/posix/sched.h +++ b/posix/sched.h @@ -27,8 +27,10 @@ #define __need_size_t #include <stddef.h> -#define __need_time_t -#define __need_timespec +#ifdef __USE_XOPEN2K +# define __need_time_t +# define __need_timespec +#endif #include <time.h> #ifndef __pid_t_defined |