[Pkg-wmaker-commits] [wmbiff] 29/32: un-shadow a global variable

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_3_8
in repository wmbiff.

commit dec82176fdffb6badb956f44a00e6466612927b2
Author: bluehal <bluehal>
Date:   Mon Mar 18 09:46:43 2002 +0000

    un-shadow a global variable
---
 wmgeneral/wmgeneral.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wmgeneral/wmgeneral.c b/wmgeneral/wmgeneral.c
index 5911900..acda07e 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -165,7 +165,7 @@ void parse_rcfile2(const char *filename, rckeys2 *keys) {
 |* GetXPM																	   *|
 \*******************************************************************************/
 
-static void GetXPM(XpmIcon *wmgen, const char *pixmap_bytes[]) {
+static void GetXPM(XpmIcon *wmgen_local, const char *pixmap_bytes[]) {
 
 	XWindowAttributes	attributes;
 	int					err;
@@ -173,10 +173,12 @@ static void GetXPM(XpmIcon *wmgen, const char *pixmap_bytes[]) {
 	/* For the colormap */
 	XGetWindowAttributes(display, Root, &attributes);
 
-	wmgen->attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
+	wmgen_local->attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
 
-	err = XpmCreatePixmapFromData(display, Root, (char **)pixmap_bytes, &(wmgen->pixmap),
-					&(wmgen->mask), &(wmgen->attributes));
+	err = XpmCreatePixmapFromData(display, Root, (char **)pixmap_bytes, 
+                                  &(wmgen_local->pixmap),
+                                  &(wmgen_local->mask), 
+                                  &(wmgen_local->attributes));
 	
 	if (err != XpmSuccess) {
 		fprintf(stderr, "Not enough free colorcells.\n");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git