Attachment #7458 for bug #16174

View | Details | Raw Unified | Return to bug 16174
Collapse All | Expand All




  {
      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




--- 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
 
 /*

Return to bug 16174

Lines 1168-1206 Link Here

(-)xview/patches/patch-li (-33 lines)
1168	{	1168	{
1169	int ndelay;	1169	int ndelay;
1170	Notify_error return_code;	1170	Notify_error return_code;
1171	diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy.h ./lib/libxview/notify/ntfy.h
1172	*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy.h Tue Jun 29 01:18:14 1993
1173	--- ./lib/libxview/notify/ntfy.h Sun Nov 20 13:39:05 1994
1174	***************
1175	* 22,27 **
1176	--- 22,31 ----
1177	#include <sys/rusage.h>
1178	#endif
1179	#include <sys/resource.h>
1180	+ #if (defined(BSD) && (BSD >= 199103))
1181	+ #include <sys/wait.h>
1182	+ #include <sys/signal.h>
1183	+ #endif
1184	#include <xview/notify.h>
1185
1186	/*
1187	***************
1188	* 149,155 **
1189	*/
1190	typedef struct ntfy_wait3_data {
1191	int pid; /* Process waiting for */
1192	! #ifndef SVR4
1193	union wait status; /* Return value from wait3 */
1194	#else SVR4
1195	int status; /* Return value from wait3 */
1196	--- 153,159 ----
1197	*/
1198	typedef struct ntfy_wait3_data {
1199	int pid; /* Process waiting for */
1200	! #if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
1201	union wait status; /* Return value from wait3 */
1202	#else SVR4
1203	int status; /* Return value from wait3 */
1204	diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c ./lib/libxview/notify/ntfy_test.c	1171	diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c ./lib/libxview/notify/ntfy_test.c
1205	*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c Tue Jun 29 01:18:12 1993	1172	*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c Tue Jun 29 01:18:12 1993
1206	--- ./lib/libxview/notify/ntfy_test.c Sun Nov 20 13:39:05 1994	1173	--- ./lib/libxview/notify/ntfy_test.c Sun Nov 20 13:39:05 1994

Line 0 Link Here

(-)xview/patches/patch-lo (+36 lines)
	1	--- lib/libxview/notify/ntfy.h.orig Tue Jun 29 07:18:14 1993
	2	+++ lib/libxview/notify/ntfy.h Mon Jan 10 15:50:53 2000
	3	@@ -22,6 +22,10 @@
	4	#include <sys/rusage.h>
	5	#endif
	6	#include <sys/resource.h>
	7	+#if (defined(BSD) && (BSD >= 199103))
	8	+#include <sys/wait.h>
	9	+#include <sys/signal.h>
	10	+#endif
	11	#include <xview/notify.h>
	12
	13	/*
	14	@@ -149,7 +153,7 @@
	15	*/
	16	typedef struct ntfy_wait3_data {
	17	int pid; /* Process waiting for */
	18	-#ifndef SVR4
	19	+#if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
	20	union wait status; /* Return value from wait3 */
	21	#else SVR4
	22	int status; /* Return value from wait3 */
	23	@@ -188,7 +197,12 @@
	24	#define sigisempty(s) (!(((s)->__sigbits[0]) \| ((s)->__sigbits[1]) \
	25	\| ((s)->__sigbits[2]) \| ((s)->__sigbits[3])))
	26	#else
	27	-#define sigisempty(s) (!(*(s)))
	28	+static int
	29	+sigisempty (sigset_t *s) {
	30	+ sigset_t n;
	31	+ bzero(&n, sizeof(sigset_t));
	32	+ return (! memcmp(&n, s, sizeof(sigset_t)));
	33	+}
	34	#endif
	35
	36	/*