mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-18 12:16:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
Remove struct __pthread_attr_s forward declaration.
	* sysdeps/unix/sysv/linux/alpha/bits/siginfo.h: Likewise.
	* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h: Likewise.
	* sysdeps/unix/sysv/linux/s390/bits/siginfo.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/siginfo.h: Likewise.
This commit is contained in:
Ulrich Drepper 2003-03-26 05:25:58 +00:00
parent 722aab6e7c
commit 42374865bc
5 changed files with 56 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -89,6 +89,11 @@
timer info for what the kernel provides these days. timer info for what the kernel provides these days.
(struct sigevent): Add _tid field. (struct sigevent): Add _tid field.
Define SIGEV_THREAD_ID. Define SIGEV_THREAD_ID.
Remove struct __pthread_attr_s forward declaration.
* sysdeps/unix/sysv/linux/alpha/bits/siginfo.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h: Likewise.
* sysdeps/unix/sysv/linux/s390/bits/siginfo.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/siginfo.h: Likewise.
* Versions.def (librt): Add GLIBC_2.3.3. * Versions.def (librt): Add GLIBC_2.3.3.

38
sysdeps/unix/sysv/linux/alpha/bits/siginfo.h
View File

@ -1,5 +1,5 @@
/* siginfo_t, sigevent and constants. Linux/Alpha version. /* siginfo_t, sigevent and constants. Linux/Alpha version.
Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc. Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -22,8 +22,6 @@
# error "Never include this file directly. Use <signal.h> instead" # error "Never include this file directly. Use <signal.h> instead"
#endif #endif
#include <bits/wordsize.h>
#if (!defined __have_sigval_t \ #if (!defined __have_sigval_t \
&& (defined _SIGNAL_H || defined __need_siginfo_t \ && (defined _SIGNAL_H || defined __need_siginfo_t \
|| defined __need_sigevent_t)) || defined __need_sigevent_t))
@ -42,11 +40,7 @@ typedef union sigval
# define __have_siginfo_t 1 # define __have_siginfo_t 1
# define __SI_MAX_SIZE 128 # define __SI_MAX_SIZE 128
# if __WORDSIZE == 64 # define __SI_PAD_SIZE ((__SI_MAX_SIZE / sizeof (int)) - 4)
# define __SI_PAD_SIZE ((__SI_MAX_SIZE / sizeof (int)) - 4)
# else
# define __SI_PAD_SIZE ((__SI_MAX_SIZE / sizeof (int)) - 3)
# endif
typedef struct siginfo typedef struct siginfo
{ {
@ -69,8 +63,10 @@ typedef struct siginfo
/* POSIX.1b timers. */ /* POSIX.1b timers. */
struct struct
{ {
unsigned int _timer1; int si_tid; /* Timer ID. */
unsigned int _timer2; int si_overrun; /* Overrun count. */
char _pad[sizeof (__uid_t) - sizeof (int)];
sigval_t si_sigval; /* Signal value. */
} _timer; } _timer;
/* POSIX.1b signals. */ /* POSIX.1b signals. */
@ -110,8 +106,8 @@ typedef struct siginfo
/* X/Open requires some more fields with fixed names. */ /* X/Open requires some more fields with fixed names. */
# define si_pid _sifields._kill.si_pid # define si_pid _sifields._kill.si_pid
# define si_uid _sifields._kill.si_uid # define si_uid _sifields._kill.si_uid
# define si_timer1 _sifields._timer._timer1 # define si_timerid _sifields._timer.si_tid
# define si_timer2 _sifields._timer._timer2 # define si_overrun _sifields._timer.si_overrun
# define si_status _sifields._sigchld.si_status # define si_status _sifields._sigchld.si_status
# define si_utime _sifields._sigchld.si_utime # define si_utime _sifields._sigchld.si_utime
# define si_stime _sifields._sigchld.si_stime # define si_stime _sifields._sigchld.si_stime
@ -261,14 +257,7 @@ enum
/* Structure to transport application-defined values with signals. */ /* Structure to transport application-defined values with signals. */
# define __SIGEV_MAX_SIZE 64 # define __SIGEV_MAX_SIZE 64
# if __WORDSIZE == 64 # define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
# define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
# else
# define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 3)
# endif
/* Forward declaration of the `pthread_attr_t' type. */
struct __pthread_attr_s;
typedef struct sigevent typedef struct sigevent
{ {
@ -280,6 +269,10 @@ typedef struct sigevent
{ {
int _pad[__SIGEV_PAD_SIZE]; int _pad[__SIGEV_PAD_SIZE];
/* When SIGEV_SIGNAL and SIGEV_THREAD_ID set, LWP ID of the
thread to receive the signal. */
__pid_t _tid;
struct struct
{ {
void (*_function) (sigval_t); /* Function to start. */ void (*_function) (sigval_t); /* Function to start. */
@ -299,8 +292,11 @@ enum
# define SIGEV_SIGNAL SIGEV_SIGNAL # define SIGEV_SIGNAL SIGEV_SIGNAL
SIGEV_NONE, /* Other notification: meaningless. */ SIGEV_NONE, /* Other notification: meaningless. */
# define SIGEV_NONE SIGEV_NONE # define SIGEV_NONE SIGEV_NONE
SIGEV_THREAD /* Deliver via thread creation. */ SIGEV_THREAD, /* Deliver via thread creation. */
# define SIGEV_THREAD SIGEV_THREAD # define SIGEV_THREAD SIGEV_THREAD
SIGEV_THREAD_ID = 4 /* Send signal to specific thread. */
#define SIGEV_THREAD_ID SIGEV_THREAD_ID
}; };
#endif /* have _SIGNAL_H. */ #endif /* have _SIGNAL_H. */

20
sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
View File

@ -1,5 +1,5 @@
/* siginfo_t, sigevent and constants. Linux/ia64 version. /* siginfo_t, sigevent and constants. Linux/ia64 version.
Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by David Mosberger-Tang <davidm@hpl.hp.com>. Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
@ -65,8 +65,10 @@ typedef struct siginfo
/* POSIX.1b timers. */ /* POSIX.1b timers. */
struct struct
{ {
unsigned int _timer1; int si_tid; /* Timer ID. */
unsigned int _timer2; int si_overrun; /* Overrun count. */
char _pad[sizeof (__uid_t) - sizeof (int)];
sigval_t si_sigval; /* Signal value. */
} _timer; } _timer;
/* POSIX.1b signals. */ /* POSIX.1b signals. */
@ -109,6 +111,8 @@ typedef struct siginfo
/* X/Open requires some more fields with fixed names. */ /* X/Open requires some more fields with fixed names. */
# define si_pid _sifields._kill.si_pid # define si_pid _sifields._kill.si_pid
# define si_uid _sifields._kill.si_uid # define si_uid _sifields._kill.si_uid
# define si_timerid _sifields._timer.si_tid
# define si_overrun _sifields._timer.si_overrun
# define si_status _sifields._sigchld.si_status # define si_status _sifields._sigchld.si_status
# define si_utime _sifields._sigchld.si_utime # define si_utime _sifields._sigchld.si_utime
# define si_stime _sifields._sigchld.si_stime # define si_stime _sifields._sigchld.si_stime
@ -294,10 +298,7 @@ enum
# define __SIGEV_MAX_SIZE 64 # define __SIGEV_MAX_SIZE 64
# define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 4) # define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 4)
/* Forward declaration of the `pthread_attr_t' type. */ struct sigevent
struct __pthread_attr_s;
typedef struct sigevent
{ {
sigval_t sigev_value; sigval_t sigev_value;
int sigev_signo; int sigev_signo;
@ -326,8 +327,11 @@ enum
# define SIGEV_SIGNAL SIGEV_SIGNAL # define SIGEV_SIGNAL SIGEV_SIGNAL
SIGEV_NONE, /* Other notification: meaningless. */ SIGEV_NONE, /* Other notification: meaningless. */
# define SIGEV_NONE SIGEV_NONE # define SIGEV_NONE SIGEV_NONE
SIGEV_THREAD /* Deliver via thread creation. */ SIGEV_THREAD, /* Deliver via thread creation. */
# define SIGEV_THREAD SIGEV_THREAD # define SIGEV_THREAD SIGEV_THREAD
SIGEV_THREAD_ID = 4 /* Send signal to specific thread. */
#define SIGEV_THREAD_ID SIGEV_THREAD_ID
}; };
#endif /* have _SIGNAL_H. */ #endif /* have _SIGNAL_H. */

20
sysdeps/unix/sysv/linux/s390/bits/siginfo.h
View File

@ -1,5 +1,5 @@
/* siginfo_t, sigevent and constants. S/390 version. /* siginfo_t, sigevent and constants. S/390 version.
Copyright (C) 2001, 2002 Free Software Foundation, Inc. Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -69,8 +69,10 @@ typedef struct siginfo
/* POSIX.1b timers. */ /* POSIX.1b timers. */
struct struct
{ {
unsigned int _timer1; int si_tid; /* Timer ID. */
unsigned int _timer2; int si_overrun; /* Overrun count. */
char _pad[sizeof (__uid_t) - sizeof (int)];
sigval_t si_sigval; /* Signal value. */
} _timer; } _timer;
/* POSIX.1b signals. */ /* POSIX.1b signals. */
@ -111,8 +113,8 @@ typedef struct siginfo
/* X/Open requires some more fields with fixed names. */ /* X/Open requires some more fields with fixed names. */
# define si_pid _sifields._kill.si_pid # define si_pid _sifields._kill.si_pid
# define si_uid _sifields._kill.si_uid # define si_uid _sifields._kill.si_uid
# define si_timer1 _sifields._timer._timer1 # define si_timerid _sifields._timer.si_tid
# define si_timer2 _sifields._timer._timer2 # define si_overrun _sifields._timer.si_overrun
# define si_status _sifields._sigchld.si_status # define si_status _sifields._sigchld.si_status
# define si_utime _sifields._sigchld.si_utime # define si_utime _sifields._sigchld.si_utime
# define si_stime _sifields._sigchld.si_stime # define si_stime _sifields._sigchld.si_stime
@ -269,9 +271,6 @@ enum
# define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 3) # define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 3)
# endif # endif
/* Forward declaration of the `pthread_attr_t' type. */
struct __pthread_attr_s;
typedef struct sigevent typedef struct sigevent
{ {
sigval_t sigev_value; sigval_t sigev_value;
@ -301,8 +300,11 @@ enum
# define SIGEV_SIGNAL SIGEV_SIGNAL # define SIGEV_SIGNAL SIGEV_SIGNAL
SIGEV_NONE, /* Other notification: meaningless. */ SIGEV_NONE, /* Other notification: meaningless. */
# define SIGEV_NONE SIGEV_NONE # define SIGEV_NONE SIGEV_NONE
SIGEV_THREAD /* Deliver via thread creation. */ SIGEV_THREAD, /* Deliver via thread creation. */
# define SIGEV_THREAD SIGEV_THREAD # define SIGEV_THREAD SIGEV_THREAD
SIGEV_THREAD_ID = 4 /* Send signal to specific thread. */
#define SIGEV_THREAD_ID SIGEV_THREAD_ID
}; };
#endif /* have _SIGNAL_H. */ #endif /* have _SIGNAL_H. */

20
sysdeps/unix/sysv/linux/sparc/bits/siginfo.h
View File

@ -1,5 +1,5 @@
/* siginfo_t, sigevent and constants. Linux/SPARC version. /* siginfo_t, sigevent and constants. Linux/SPARC version.
Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc. Copyright (C) 1997-2002, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -69,8 +69,10 @@ typedef struct siginfo
/* POSIX.1b timers. */ /* POSIX.1b timers. */
struct struct
{ {
unsigned int _timer1; int si_tid; /* Timer ID. */
unsigned int _timer2; int si_overrun; /* Overrun count. */
char _pad[sizeof (__uid_t) - sizeof (int)];
sigval_t si_sigval; /* Signal value. */
} _timer; } _timer;
/* POSIX.1b signals. */ /* POSIX.1b signals. */
@ -111,8 +113,8 @@ typedef struct siginfo
/* X/Open requires some more fields with fixed names. */ /* X/Open requires some more fields with fixed names. */
# define si_pid _sifields._kill.si_pid # define si_pid _sifields._kill.si_pid
# define si_uid _sifields._kill.si_uid # define si_uid _sifields._kill.si_uid
# define si_timer1 _sifields._timer._timer1 # define si_timerid _sifields._timer.si_tid
# define si_timer2 _sifields._timer._timer2 # define si_overrun _sifields._timer.si_overrun
# define si_status _sifields._sigchld.si_status # define si_status _sifields._sigchld.si_status
# define si_utime _sifields._sigchld.si_utime # define si_utime _sifields._sigchld.si_utime
# define si_stime _sifields._sigchld.si_stime # define si_stime _sifields._sigchld.si_stime
@ -276,9 +278,6 @@ enum
# define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 3) # define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 3)
# endif # endif
/* Forward declaration of the `pthread_attr_t' type. */
struct __pthread_attr_s;
typedef struct sigevent typedef struct sigevent
{ {
sigval_t sigev_value; sigval_t sigev_value;
@ -308,8 +307,11 @@ enum
# define SIGEV_SIGNAL SIGEV_SIGNAL # define SIGEV_SIGNAL SIGEV_SIGNAL
SIGEV_NONE, /* Other notification: meaningless. */ SIGEV_NONE, /* Other notification: meaningless. */
# define SIGEV_NONE SIGEV_NONE # define SIGEV_NONE SIGEV_NONE
SIGEV_THREAD /* Deliver via thread creation. */ SIGEV_THREAD, /* Deliver via thread creation. */
# define SIGEV_THREAD SIGEV_THREAD # define SIGEV_THREAD SIGEV_THREAD
SIGEV_THREAD_ID = 4 /* Send signal to specific thread. */
#define SIGEV_THREAD_ID SIGEV_THREAD_ID
}; };
#endif /* have _SIGNAL_H. */ #endif /* have _SIGNAL_H. */