diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-02-26 13:17:27 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-02-26 13:17:27 -0500 |
| commit | 4efeffc1d583597e4f52985b9747269e47b754e2 (patch) | |
| tree | 65bb598457542a0de30c60646173679c5ea42557 /sysdeps/unix/sysv/linux/bits | |
| parent | c20105c398036c4fbeb99f8480ab84077a0f6f2c (diff) | |
| download | glibc-4efeffc1d583597e4f52985b9747269e47b754e2.tar glibc-4efeffc1d583597e4f52985b9747269e47b754e2.tar.gz glibc-4efeffc1d583597e4f52985b9747269e47b754e2.tar.bz2 glibc-4efeffc1d583597e4f52985b9747269e47b754e2.zip | |
Fix up POSIX testing in conformtest
Diffstat (limited to 'sysdeps/unix/sysv/linux/bits')
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/siginfo.h | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/time.h | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h b/sysdeps/unix/sysv/linux/bits/siginfo.h index ecef39da6a..0635e2f106 100644 --- a/sysdeps/unix/sysv/linux/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/bits/siginfo.h @@ -1,5 +1,5 @@ /* siginfo_t, sigevent and constants. Linux version. - Copyright (C) 1997-2002, 2003, 2011 Free Software Foundation, Inc. + Copyright (C) 1997-2002, 2003, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -47,7 +47,7 @@ typedef union sigval # define __SI_PAD_SIZE ((__SI_MAX_SIZE / sizeof (int)) - 3) # endif -typedef struct siginfo +typedef struct { int si_signo; /* Signal number. */ int si_errno; /* If non-zero, an errno value associated with @@ -269,6 +269,9 @@ enum # define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 3) # endif +/* Forward declaration. */ +typedef union __pthread_attr pthread_attr_t; + typedef struct sigevent { sigval_t sigev_value; @@ -286,7 +289,7 @@ typedef struct sigevent struct { void (*_function) (sigval_t); /* Function to start. */ - void *_attribute; /* Really pthread_attr_t. */ + pthread_attr_t *_attribute; /* Thread attributes. */ } _sigev_thread; } _sigev_un; } sigevent_t; diff --git a/sysdeps/unix/sysv/linux/bits/time.h b/sysdeps/unix/sysv/linux/bits/time.h index 977155c4c2..7805ce7e01 100644 --- a/sysdeps/unix/sysv/linux/bits/time.h +++ b/sysdeps/unix/sysv/linux/bits/time.h @@ -1,5 +1,5 @@ /* System-dependent timing definitions. Linux version. - Copyright (C) 1996,1997,1999-2003,2010,2011 Free Software Foundation, Inc. + Copyright (C) 1996,1997,1999-2003,2010,2011,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -47,7 +47,8 @@ struct timeval XSI-conformant systems. */ # define CLOCKS_PER_SEC 1000000l -# if !defined __STRICT_ANSI__ && !defined __USE_XOPEN2K +# if (!defined __STRICT_ANSI__ || defined __USE_POSIX) \ + && !defined __USE_XOPEN2K /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK presents the real value for clock ticks per second for the system. */ # include <bits/types.h> |