Attachment 7458 Details for Bug 16174 – file.diff

[patch] file.diff

file.diff (text/plain), 2.65 KB, created by Alexander Langer on 2000-01-18 15:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Langer

Created: 2000-01-18 15:50:01 UTC

Size: 2.65 KB

patch

obsolete

>diff -rNu xview.old/patches/patch-li xview/patches/patch-li
>--- xview.old/patches/patch-li	Wed May  5 00:58:01 1999
>+++ xview/patches/patch-li	Mon Jan 10 15:50:16 2000
>@@ -1168,39 +1168,6 @@
>   {
>       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 -rNu xview.old/patches/patch-lo xview/patches/patch-lo
>--- xview.old/patches/patch-lo	Thu Jan  1 01:00:00 1970
>+++ xview/patches/patch-lo	Tue Jan 18 16:22:04 2000
>@@ -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
>+ 
>+ /*

Actions: View | Diff

Attachments on bug 16174: 7458