about summary refs log tree commit diff
path: root/bits
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-08-16 20:33:59 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-08-16 20:33:59 +0000
commit67f0aff0c63e5deaade7f6cc7758f5cb63344fb8 (patch)
tree6cd8f38178b1ba6c4c73bf2f61d4e24df1e975dc /bits
parent87e7bf4d36af0a4622dc2687730f26d7d53003fe (diff)
downloadglibc-67f0aff0c63e5deaade7f6cc7758f5cb63344fb8.tar.gz
glibc-67f0aff0c63e5deaade7f6cc7758f5cb63344fb8.tar.xz
glibc-67f0aff0c63e5deaade7f6cc7758f5cb63344fb8.zip
Fix sigval namespace (bug 21944).
XPG4.2 defines the siginfo_t type, but not union sigval or its
contents (which were added in the 1993 edition of POSIX.1), resulting
in namespace violations for sigval, sival_int and sival_ptr for
signal.h and sys/wait.h for that standard because those headers
incorrectly expose those names in that case.

This patch fixes this problem.  The public type in this case is union
sigval, but various places in the headers use the sigval_t name for
it; direct uses of union sigval are already properly guarded or in
headers not in XPG4.2.  Now, sigval_t, although not a standard name,
does seem to be widely used outside glibc.  The approach taken by this
patch is to make installed headers use the name __sigval_t instead.
__sigval_t is then defined to either union sigval or union __sigval
(where union __sigval has __-prefixed member names as well), depending
on whether there are any namespace issues with the union sigval name
and its members.  In the case where union __sigval is used, sigval_t
is not defined at all, to avoid the problem of sigval_t having a C++
mangled name that depends on feature test macros.  sigval_t is still
defined by signal.h if __USE_MISC (reflecting the nonstandard nature
of that name).

Tested for x86_64.

	[BZ #21944]
	* signal/bits/types/__sigval_t.h: New file.
	* signal/Makefile (headers): Add bits/types/__sigval_t.h.
	* signal/bits/types/sigval_t.h: Include <bits/types/__sigval_t.h>
	and define sigval_t using __sigval_t.
	* include/bits/types/__sigval_t.h: New file.
	* bits/types/sigevent_t.h: Include <bits/types/__sigval_t.h>
	instead of <bits/types/__sigval_t.h>.
	(struct sigevent): Use __sigval_t instead of sigval_t.
	* bits/types/siginfo_t.h: Include <bits/types/__sigval_t.h>
	instead of <bits/types/__sigval_t.h>.
	(siginfo_t): Use __sigval_t instead of sigval_t.
	* sysdeps/unix/sysv/linux/bits/types/sigevent_t.h: Include
	<bits/types/__sigval_t.h> instead of <bits/types/__sigval_t.h>.
	(struct sigevent): Use __sigval_t instead of sigval_t.
	* sysdeps/unix/sysv/linux/bits/types/siginfo_t.h: Include
	<bits/types/__sigval_t.h> instead of <bits/types/__sigval_t.h>.
	(siginfo_t): Use __sigval_t instead of sigval_t.
	* signal/signal.h [__USE_MISC]: Include <bits/types/sigval_t.h>.
Diffstat (limited to 'bits')
-rw-r--r--bits/types/sigevent_t.h6
-rw-r--r--bits/types/siginfo_t.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/bits/types/sigevent_t.h b/bits/types/sigevent_t.h
index 7b8cb054d7..5611268610 100644
--- a/bits/types/sigevent_t.h
+++ b/bits/types/sigevent_t.h
@@ -2,15 +2,15 @@
 #define __sigevent_t_defined 1
 
 #include <bits/types.h>
-#include <bits/types/sigval_t.h>
+#include <bits/types/__sigval_t.h>
 
 /* Structure to transport application-defined values with signals.  */
 typedef struct sigevent
   {
-    sigval_t sigev_value;
+    __sigval_t sigev_value;
     int sigev_signo;
     int sigev_notify;
-    void (*sigev_notify_function) (sigval_t);	    /* Function to start.  */
+    void (*sigev_notify_function) (__sigval_t);	    /* Function to start.  */
     void *sigev_notify_attributes;		    /* Really pthread_attr_t.*/
   } sigevent_t;
 
diff --git a/bits/types/siginfo_t.h b/bits/types/siginfo_t.h
index ab6bf18bec..1ac2a98fbd 100644
--- a/bits/types/siginfo_t.h
+++ b/bits/types/siginfo_t.h
@@ -2,7 +2,7 @@
 #define __siginfo_t_defined 1
 
 #include <bits/types.h>
-#include <bits/types/sigval_t.h>
+#include <bits/types/__sigval_t.h>
 
 typedef struct siginfo
   {
@@ -15,7 +15,7 @@ typedef struct siginfo
     void *si_addr;		/* Address of faulting instruction.  */
     int si_status;		/* Exit value or signal.  */
     long int si_band;		/* Band event for SIGPOLL.  */
-    sigval_t si_value;		/* Signal value.  */
+    __sigval_t si_value;	/* Signal value.  */
   } siginfo_t;
 
 #endif