aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-02-26 19:39:23 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-02-26 19:39:23 +0000
commit397c66b46502b1bc91e19ac7bbdcf3f3f515b1a7 (patch)
tree5820e52b8bcd891f2dc62be279f22e6192b52943
parent7ba6eb7c8ac8f884bec5633e843fca25f01590e4 (diff)
downloadglibc-397c66b46502b1bc91e19ac7bbdcf3f3f515b1a7.tar.xz
glibc-397c66b46502b1bc91e19ac7bbdcf3f3f515b1a7.zip
MIPS: Name pthread_attr_t union, use it in sigevent, don't name siginfo_t struct.
-rw-r--r--ChangeLog.mips8
-rw-r--r--sysdeps/unix/sysv/linux/mips/bits/siginfo.h10
-rw-r--r--sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h4
3 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog.mips b/ChangeLog.mips
index bcea57fb66..9442105b04 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,11 @@
+2012-02-26 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/mips/bits/siginfo.h: Don't name
+ siginfo_t struct. Add forward declaration of pthread_attr_t and
+ use it in sigevent.
+ * sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h: Name
+ pthread_attr_t union.
+
2012-02-21 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/bits/epoll.h: New file.
diff --git a/sysdeps/unix/sysv/linux/mips/bits/siginfo.h b/sysdeps/unix/sysv/linux/mips/bits/siginfo.h
index 484668f449..3d776e2d43 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/siginfo.h
@@ -1,6 +1,5 @@
/* siginfo_t, sigevent and constants. Linux/MIPS version.
- Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 1997-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
@@ -50,7 +49,7 @@ typedef union sigval
# endif
-typedef struct siginfo
+typedef struct
{
int si_signo; /* Signal number. */
int si_code; /* Signal code. */
@@ -274,6 +273,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;
@@ -291,7 +293,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/mips/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h
index 166a6c6aee..87a25daabf 100644
--- a/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h
+++ b/sysdeps/unix/sysv/linux/mips/nptl/bits/pthreadtypes.h
@@ -1,5 +1,5 @@
/* Machine-specific pthread type layouts. MIPS version.
- Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2005-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
@@ -50,7 +50,7 @@
typedef unsigned long int pthread_t;
-typedef union
+typedef union __pthread_attr
{
char __size[__SIZEOF_PTHREAD_ATTR_T];
long int __align;