[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / x11 / Xaw-Xpm / patches

File: [cvs.NetBSD.org] / pkgsrc / x11 / Xaw-Xpm / patches / patch-aa (download)

Revision 1.4, Tue Oct 9 11:09:22 2007 UTC (13 years, 3 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, cwrapper, cube-native-xorg-base, cube-native-xorg, HEAD
Changes since 1.3: +82 -4 lines

Fixed the build errors with gcc4.

$NetBSD: patch-aa,v 1.4 2007/10/09 11:09:22 rillig 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();