Change <sys/_sigset.h> to typedef __sigset_t instead of sigset_t, so

that headers that include it can conditionalize sigset_t's visibility.

3 files changed, 12 insertions, 1 deletions

diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index 3800316..dfb954e 100644
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -54,6 +54,6 @@
 
 typedef struct __sigset {
 	__uint32_t __bits[_SIG_WORDS];
-} sigset_t;
+} __sigset_t;
 
 #endif /* !_SYS__SIGSET_H_ */
diff --git a/sys/sys/select.h b/sys/sys/select.h
index 11aacdd..6755360 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -54,6 +54,11 @@ typedef	unsigned long	__fd_mask;
 typedef	__fd_mask	fd_mask;
 #endif
 
+#ifndef _SIGSET_T_DECLARED
+#define	_SIGSET_T_DECLARED
+typedef	__sigset_t	sigset_t;
+#endif
+
 /*
  * Select uses bit masks of file descriptors in longs.  These macros
  * manipulate such bit fields (the filesystem macros use chars).
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 9098326..65f401f 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -94,6 +94,12 @@
 #define	SIGUSR1		30	/* user defined signal 1 */
 #define	SIGUSR2		31	/* user defined signal 2 */
 
+/* XXX needs namespace conditional. */
+#ifndef _SIGSET_T_DECLARED
+#define	_SIGSET_T_DECLARED
+typedef	__sigset_t	sigset_t;
+#endif
+
 /*-
  * Type of a signal handling function.
  *