head	1.4;
access;
symbols
	pkgsrc-2026Q1:1.4.0.154
	pkgsrc-2026Q1-base:1.4
	pkgsrc-2025Q4:1.4.0.152
	pkgsrc-2025Q4-base:1.4
	pkgsrc-2025Q3:1.4.0.150
	pkgsrc-2025Q3-base:1.4
	pkgsrc-2025Q2:1.4.0.148
	pkgsrc-2025Q2-base:1.4
	pkgsrc-2025Q1:1.4.0.146
	pkgsrc-2025Q1-base:1.4
	pkgsrc-2024Q4:1.4.0.144
	pkgsrc-2024Q4-base:1.4
	pkgsrc-2024Q3:1.4.0.142
	pkgsrc-2024Q3-base:1.4
	pkgsrc-2024Q2:1.4.0.140
	pkgsrc-2024Q2-base:1.4
	pkgsrc-2024Q1:1.4.0.138
	pkgsrc-2024Q1-base:1.4
	pkgsrc-2023Q4:1.4.0.136
	pkgsrc-2023Q4-base:1.4
	pkgsrc-2023Q3:1.4.0.134
	pkgsrc-2023Q3-base:1.4
	pkgsrc-2023Q2:1.4.0.132
	pkgsrc-2023Q2-base:1.4
	pkgsrc-2023Q1:1.4.0.130
	pkgsrc-2023Q1-base:1.4
	pkgsrc-2022Q4:1.4.0.128
	pkgsrc-2022Q4-base:1.4
	pkgsrc-2022Q3:1.4.0.126
	pkgsrc-2022Q3-base:1.4
	pkgsrc-2022Q2:1.4.0.124
	pkgsrc-2022Q2-base:1.4
	pkgsrc-2022Q1:1.4.0.122
	pkgsrc-2022Q1-base:1.4
	pkgsrc-2021Q4:1.4.0.120
	pkgsrc-2021Q4-base:1.4
	pkgsrc-2021Q3:1.4.0.118
	pkgsrc-2021Q3-base:1.4
	pkgsrc-2021Q2:1.4.0.116
	pkgsrc-2021Q2-base:1.4
	pkgsrc-2021Q1:1.4.0.114
	pkgsrc-2021Q1-base:1.4
	pkgsrc-2020Q4:1.4.0.112
	pkgsrc-2020Q4-base:1.4
	pkgsrc-2020Q3:1.4.0.110
	pkgsrc-2020Q3-base:1.4
	pkgsrc-2020Q2:1.4.0.106
	pkgsrc-2020Q2-base:1.4
	pkgsrc-2020Q1:1.4.0.86
	pkgsrc-2020Q1-base:1.4
	pkgsrc-2019Q4:1.4.0.108
	pkgsrc-2019Q4-base:1.4
	pkgsrc-2019Q3:1.4.0.104
	pkgsrc-2019Q3-base:1.4
	pkgsrc-2019Q2:1.4.0.102
	pkgsrc-2019Q2-base:1.4
	pkgsrc-2019Q1:1.4.0.100
	pkgsrc-2019Q1-base:1.4
	pkgsrc-2018Q4:1.4.0.98
	pkgsrc-2018Q4-base:1.4
	pkgsrc-2018Q3:1.4.0.96
	pkgsrc-2018Q3-base:1.4
	pkgsrc-2018Q2:1.4.0.94
	pkgsrc-2018Q2-base:1.4
	pkgsrc-2018Q1:1.4.0.92
	pkgsrc-2018Q1-base:1.4
	pkgsrc-2017Q4:1.4.0.90
	pkgsrc-2017Q4-base:1.4
	pkgsrc-2017Q3:1.4.0.88
	pkgsrc-2017Q3-base:1.4
	pkgsrc-2017Q2:1.4.0.84
	pkgsrc-2017Q2-base:1.4
	pkgsrc-2017Q1:1.4.0.82
	pkgsrc-2017Q1-base:1.4
	pkgsrc-2016Q4:1.4.0.80
	pkgsrc-2016Q4-base:1.4
	pkgsrc-2016Q3:1.4.0.78
	pkgsrc-2016Q3-base:1.4
	pkgsrc-2016Q2:1.4.0.76
	pkgsrc-2016Q2-base:1.4
	pkgsrc-2016Q1:1.4.0.74
	pkgsrc-2016Q1-base:1.4
	pkgsrc-2015Q4:1.4.0.72
	pkgsrc-2015Q4-base:1.4
	pkgsrc-2015Q3:1.4.0.70
	pkgsrc-2015Q3-base:1.4
	pkgsrc-2015Q2:1.4.0.68
	pkgsrc-2015Q2-base:1.4
	pkgsrc-2015Q1:1.4.0.66
	pkgsrc-2015Q1-base:1.4
	pkgsrc-2014Q4:1.4.0.64
	pkgsrc-2014Q4-base:1.4
	pkgsrc-2014Q3:1.4.0.62
	pkgsrc-2014Q3-base:1.4
	pkgsrc-2014Q2:1.4.0.60
	pkgsrc-2014Q2-base:1.4
	pkgsrc-2014Q1:1.4.0.58
	pkgsrc-2014Q1-base:1.4
	pkgsrc-2013Q4:1.4.0.56
	pkgsrc-2013Q4-base:1.4
	pkgsrc-2013Q3:1.4.0.54
	pkgsrc-2013Q3-base:1.4
	pkgsrc-2013Q2:1.4.0.52
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2013Q1:1.4.0.50
	pkgsrc-2013Q1-base:1.4
	pkgsrc-2012Q4:1.4.0.48
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2012Q3:1.4.0.46
	pkgsrc-2012Q3-base:1.4
	pkgsrc-2012Q2:1.4.0.44
	pkgsrc-2012Q2-base:1.4
	pkgsrc-2012Q1:1.4.0.42
	pkgsrc-2012Q1-base:1.4
	pkgsrc-2011Q4:1.4.0.40
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q3:1.4.0.38
	pkgsrc-2011Q3-base:1.4
	pkgsrc-2011Q2:1.4.0.36
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2011Q1:1.4.0.34
	pkgsrc-2011Q1-base:1.4
	pkgsrc-2010Q4:1.4.0.32
	pkgsrc-2010Q4-base:1.4
	pkgsrc-2010Q3:1.4.0.30
	pkgsrc-2010Q3-base:1.4
	pkgsrc-2010Q2:1.4.0.28
	pkgsrc-2010Q2-base:1.4
	pkgsrc-2010Q1:1.4.0.26
	pkgsrc-2010Q1-base:1.4
	pkgsrc-2009Q4:1.4.0.24
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2009Q3:1.4.0.22
	pkgsrc-2009Q3-base:1.4
	pkgsrc-2009Q2:1.4.0.20
	pkgsrc-2009Q2-base:1.4
	pkgsrc-2009Q1:1.4.0.18
	pkgsrc-2009Q1-base:1.4
	pkgsrc-2008Q4:1.4.0.16
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.14
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.12
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.10
	pkgsrc-2008Q2-base:1.4
	cwrapper:1.4.0.8
	pkgsrc-2008Q1:1.4.0.6
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.4
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.2
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.3.0.38
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.36
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.34
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.32
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.30
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.28
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.26
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.24
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.22
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.20
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.18
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.16
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.14
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.12
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.10
	pkgsrc-2003Q4-base:1.3
	netbsd-1-6-1:1.3.0.6
	netbsd-1-6-1-base:1.3
	netbsd-1-6:1.3.0.8
	netbsd-1-6-RELEASE-base:1.3
	pkgviews:1.3.0.4
	pkgviews-base:1.3
	buildlink2:1.3.0.2
	buildlink2-base:1.3
	netbsd-1-5-PATCH003:1.3
	netbsd-1-5-PATCH001:1.3
	netbsd-1-5-RELEASE:1.3
	netbsd-1-4-PATCH003:1.3
	netbsd-1-4-PATCH002:1.3
	comdex-fall-1999:1.3
	netbsd-1-4-PATCH001:1.3
	netbsd-1-4-RELEASE:1.2
	netbsd-1-3-PATCH003:1.2
	netbsd-1-3-PATCH002:1.1;
locks; strict;
comment	@# @;


1.4
date	2007.10.09.11.09.22;	author rillig;	state Exp;
branches;
next	1.3;

1.3
date	99.06.28.09.11.13;	author agc;	state Exp;
branches;
next	1.2;

1.2
date	98.08.07.11.17.57;	author agc;	state Exp;
branches;
next	1.1;

1.1
date	98.05.05.13.46.32;	author frueauf;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Fixed the build errors with gcc4.
@
text
@$NetBSD: patch-aa,v 1.3 1999/06/28 09:11:13 agc Exp $

Handle wide signal masks.

For the removal of the type casts, see patch-ak.

--- Xpm.c.orig	1996-11-26 14:40:26.000000000 +0100
+++ Xpm.c	2007-10-09 12:54:37.000000000 +0200
@@@@ -46,7 +46,7 @@@@ char directory[MAXPATHLEN];
 			}
 			chdir(directory);
 		}
-		(PixmapNode *)PixList.first = (PixmapNode *)pixnode;
+		PixList.first = pixnode;
 		pixnode->next = NULL;
 		PixList.n_entries = 1;
 		pixnode->filename = filename;
@@@@ -55,18 +55,18 @@@@ char directory[MAXPATHLEN];
 
 /* Is the pixmap already in the list? */
 
-	(PixmapNode *)pixnode = (PixmapNode *)PixList.first;
+	pixnode = PixList.first;
 	for(;;)
 	{
 		if(strncmp(filename,pixnode->filename, MAXPATHLEN) == 0)
 			return((Pixmap *)&pixnode->pixmap);
 		if(pixnode->next == NULL) break;
-		(PixmapNode *)pixnode = (PixmapNode *)pixnode->next;
+		pixnode = pixnode->next;
 	}
 
 /* Didnt find the pixmap...make a new one */
 	
-	(PixmapNode *)pixnew = (void *)malloc(sizeof(PixmapNode));
+	pixnew = (void *)malloc(sizeof(PixmapNode));
 	
 	XGetWindowAttributes(XtDisplay(w) ,DefaultRootWindow(XtDisplay(w)),&root_att);
    	orig_att.closeness=65536;
@@@@ -86,7 +86,7 @@@@ char directory[MAXPATHLEN];
    		 }
    		 chdir(directory);
    	}
-	(PixmapNode *)pixnode->next = (PixmapNode *)pixnew;
+	pixnode->next = pixnew;
 	pixnew->filename = filename;
 	pixnew->next = NULL;
    	return((Pixmap *)&pixnew->pixmap);
@@@@ -105,7 +105,7 @@@@ XpmAttributes orig_att;
 char error_buf[BUFSIZ];
 char directory[MAXPATHLEN];
 
-           (PixmapNode *)pixnode = (PixmapNode *)PixList.first;
+           pixnode = PixList.first;
 	for(;;)
 	{
 		if(strncmp(filename,pixnode->filename, MAXPATHLEN) == 0)
@@@@ -114,7 +114,7 @@@@ char directory[MAXPATHLEN];
 			break;
 		}
 		if(pixnode->next == NULL) break;
-		(PixmapNode *)pixnode = (PixmapNode *)pixnode->next;
+		pixnode = pixnode->next;
 	}
 	if(found)
 	{
@@@@ -140,7 +140,7 @@@@ char directory[MAXPATHLEN];
    	}
 	else
 	{
-		(PixmapNode *)pixnew = (void *)malloc(sizeof(PixmapNode));
+		pixnew = (void *)malloc(sizeof(PixmapNode));
 		 XGetWindowAttributes(XtDisplay(w) ,DefaultRootWindow(XtDisplay(w)),&root_att);
   	 	orig_att.closeness=65536;
   	 	orig_att.colormap=root_att.colormap;
@@@@ -159,7 +159,7 @@@@ char directory[MAXPATHLEN];
    			}
    			chdir(directory);
  	  	}
-		(PixmapNode *)pixnode->next = (PixmapNode *)pixnew;
+		pixnode->next = pixnew;
 		pixnew->filename = filename;
 		pixnew->next = NULL;
   	 	return((Pixmap *)&pixnew->mask);
@@@@ -206,9 +206,8 @@@@ char *soundfile;
 	sigchld.
 */
   		new.sa_handler=SigHandle;
-		new.sa_mask=0;
-		new.sa_flags=SA_NOMASK | SA_ONESHOT;
-		new.sa_restorer=NULL;
+		(void) memset(&new.sa_mask, 0, sizeof(new.sa_mask));
+		new.sa_flags=SA_NODEFER;
 		sigaction(SIGCHLD, &new, &old);
 		playing = 1;
 		soundpid = fork();
@


1.3
log
@Make this compile on platforms with wide signal masks.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.2 1998/08/07 11:17:57 agc Exp $
d5 81
a85 3
--- Xpm.c.orig	Tue Nov 26 13:40:26 1996
+++ Xpm.c	Mon Jun 28 10:04:57 1999
@@@@ -206,9 +206,8 @@@@
@


1.2
log
@Add NetBSD RCS Ids.
@
text
@d1 1
a1 1
$NetBSD$
d3 7
a9 3
--- Xpm.c.orig	Tue Nov 26 06:40:26 1996
+++ Xpm.c	Fri Jan 30 01:02:57 1998
@@@@ -208,6 +208,5 @@@@
d11 1
a11 1
 		new.sa_mask=0;
d14 1
d18 1
@


1.1
log
@Initial import of Xaw-Xpm-1.1 based on pr 4912.
@
text
@d1 2
@