38 lines
1.2 KiB
Text
38 lines
1.2 KiB
Text
$NetBSD: patch-ds,v 1.1 2001/12/20 09:20:08 tron Exp $
|
|
|
|
--- lib/libxview/notify/ntfy.h.orig Tue Jun 29 07:18:14 1993
|
|
+++ lib/libxview/notify/ntfy.h Thu Dec 20 10:09:36 2001
|
|
@@ -22,6 +22,10 @@
|
|
#include <sys/rusage.h>
|
|
#endif
|
|
#include <sys/resource.h>
|
|
+#if (defined(BSD) && (BSD >= 199103))
|
|
+#include <sys/wait.h>
|
|
+#include <sys/signal.h>
|
|
+#endif
|
|
#include <xview/notify.h>
|
|
|
|
/*
|
|
@@ -149,7 +153,7 @@
|
|
*/
|
|
typedef struct ntfy_wait3_data {
|
|
int pid; /* Process waiting for */
|
|
-#ifndef SVR4
|
|
+#if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
|
|
union wait status; /* Return value from wait3 */
|
|
#else SVR4
|
|
int status; /* Return value from wait3 */
|
|
@@ -184,9 +188,12 @@
|
|
extern sigset_t ntfy_sigs_delayed;/* Bit mask of signals received while in
|
|
critical section */
|
|
|
|
-#ifdef SVR4
|
|
+#if defined(SVR4)
|
|
#define sigisempty(s) (!(((s)->__sigbits[0]) | ((s)->__sigbits[1]) \
|
|
| ((s)->__sigbits[2]) | ((s)->__sigbits[3])))
|
|
+#elif defined(__NetBSD__) && (__NetBSD_Version__ > 103080000)
|
|
+#define sigisempty(s) (!(((s)->__bits[0]) | ((s)->__bits[1]) \
|
|
+ | ((s)->__bits[2]) | ((s)->__bits[3])))
|
|
#else
|
|
#define sigisempty(s) (!(*(s)))
|
|
#endif
|