diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
| commit | 356a10ee3ee36bec0af7e8a1c61e353e0af45904 (patch) | |
| tree | 421de93f9f53c04d796ccd31102baf135dc55ed8 /nptl/sysdeps/pthread/pthread.h | |
| parent | a20026128cef2e95ffd15fb293dd6b1e9bf3ae1e (diff) | |
| parent | e456826d7a539fb322bb9719297bd386eded8e32 (diff) | |
| download | glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.gz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.xz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.zip | |
Merge branch 'master' into bug13658-branch
Diffstat (limited to 'nptl/sysdeps/pthread/pthread.h')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index 0d33cbdb9e..bd97e8556f 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -21,10 +21,6 @@ #include <features.h> #include <endian.h> #include <sched.h> -#ifdef __USE_XOPEN2K -# define __need_clockid_t -#endif -#define __need_timespec #include <time.h> #include <bits/pthreadtypes.h> |