diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-01-20 03:38:25 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-01-20 03:38:25 +0000 |
| commit | dbddd321bacaade6a0618039206f684a4042741c (patch) | |
| tree | 31f2ac373fdbb8500d2c560caf43ede9b1676b54 /x11-toolkits/xview | |
| parent | Update to version 1.0.1. (diff) | |
Fix for sigset_t changes in -current.
PR: 16174
Submitted by: Alexander Langer <alex@cichlids.com>
Diffstat (limited to 'x11-toolkits/xview')
| -rw-r--r-- | x11-toolkits/xview/files/patch-li | 33 | ||||
| -rw-r--r-- | x11-toolkits/xview/files/patch-lo | 36 |
2 files changed, 36 insertions, 33 deletions
diff --git a/x11-toolkits/xview/files/patch-li b/x11-toolkits/xview/files/patch-li index 11d903660c53..a1cf1d03031d 100644 --- a/x11-toolkits/xview/files/patch-li +++ b/x11-toolkits/xview/files/patch-li @@ -1168,39 +1168,6 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ndet_read.c ./lib/libxview/ { int ndelay; Notify_error return_code; -diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy.h ./lib/libxview/notify/ntfy.h -*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy.h Tue Jun 29 01:18:14 1993 ---- ./lib/libxview/notify/ntfy.h Sun Nov 20 13:39:05 1994 -*************** -*** 22,27 **** ---- 22,31 ---- - #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,155 **** - */ - typedef struct ntfy_wait3_data { - int pid; /* Process waiting for */ -! #ifndef SVR4 - union wait status; /* Return value from wait3 */ - #else SVR4 - int status; /* Return value from wait3 */ ---- 153,159 ---- - */ - typedef struct ntfy_wait3_data { - int pid; /* Process waiting for */ -! #if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103)) - union wait status; /* Return value from wait3 */ - #else SVR4 - int status; /* Return value from wait3 */ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c ./lib/libxview/notify/ntfy_test.c *** ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c Tue Jun 29 01:18:12 1993 --- ./lib/libxview/notify/ntfy_test.c Sun Nov 20 13:39:05 1994 diff --git a/x11-toolkits/xview/files/patch-lo b/x11-toolkits/xview/files/patch-lo new file mode 100644 index 000000000000..570132f101cb --- /dev/null +++ b/x11-toolkits/xview/files/patch-lo @@ -0,0 +1,36 @@ +--- lib/libxview/notify/ntfy.h.orig Tue Jun 29 07:18:14 1993 ++++ lib/libxview/notify/ntfy.h Mon Jan 10 15:50:53 2000 +@@ -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 */ +@@ -188,7 +197,12 @@ + #define sigisempty(s) (!(((s)->__sigbits[0]) | ((s)->__sigbits[1]) \ + | ((s)->__sigbits[2]) | ((s)->__sigbits[3]))) + #else +-#define sigisempty(s) (!(*(s))) ++static int ++sigisempty (sigset_t *s) { ++ sigset_t n; ++ bzero(&n, sizeof(sigset_t)); ++ return (! memcmp(&n, s, sizeof(sigset_t))); ++} + #endif + + /* |