X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lwlib%2Fxlwgcs.c;h=94a273b47ec646a75d2a5c85c2ed7350a062eede;hb=1e5aeb5848cf2fb2a5ff01f8f104c6a2e18a2f88;hp=ed5c480977822eed0e22429e76bcd79d9503ff78;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git.1

diff --git a/lwlib/xlwgcs.c b/lwlib/xlwgcs.c
index ed5c480..94a273b 100644
--- a/lwlib/xlwgcs.c
+++ b/lwlib/xlwgcs.c
@@ -169,7 +169,8 @@
 
 #if	XtSpecificationRelease	< 5
 
-static	GC	XtAllocateGC(Widget, int, u_long, XGCValues *, u_long, u_long) ;
+static	GC	XtAllocateGC(Widget, int, unsigned long, XGCValues *,
+			     unsigned long, unsigned long) ;
 
 #endif
 
@@ -186,7 +187,7 @@ GC
 AllocFgGC(Widget w, Pixel fg, Font font)
 {
 	XGCValues	values ;
-	u_long		vmask, dcmask ;
+	unsigned long	vmask, dcmask ;
 
 	values.foreground = fg ;
 	values.font = font ;
@@ -233,7 +234,7 @@ AllocShadeGC(Widget w, Pixel fg, Pixel bg, Font font,
 	int contrast, Bool be_nice_to_cmap)
 {
 	XGCValues	values ;
-	u_long		vmask, dcmask ;
+	unsigned long	vmask, dcmask ;
 
 	values.foreground = fg ;
 	values.background = bg ;
@@ -513,18 +514,20 @@ Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s, GC topgc, GC botgc)
 #if XtSpecificationRelease < 5
 
 static	GC
-XtAllocateGC(Widget w, int depth, u_long mask, XGCValues *values,
-	u_long dynamic, du_long ontcare)
+XtAllocateGC(Widget w, int depth, unsigned long mask, XGCValues *values,
+	     unsigned long dynamic, unsigned long dontcare)
 {
 	return XtGetGC(w, mask, values) ;
 }
 #endif
 
 
-static	u_char	screen0[2] = {0,0} ;
-static	u_char	screen25[2] = {0,0xaa} ;
-static	u_char	screen75[2] = {0xaa,0xff} ;
-static	u_char	screen100[2] = {0xff,0xff} ;
+#ifdef HAVE_XMU
+
+static	unsigned char screen0[2] = {0,0} ;
+static	unsigned char screen25[2] = {0,0xaa} ;
+static	unsigned char screen75[2] = {0xaa,0xff} ;
+static	unsigned char screen100[2] = {0xff,0xff} ;
 
 static	Pixmap
 getDitherPixmap(Widget w, int contrast)
@@ -543,3 +546,5 @@ getDitherPixmap(Widget w, int contrast)
 	else
 	  return XCreateBitmapFromData(dpy,win, (char *)screen100, 2,2) ;
 }
+
+#endif	/* HAVE_XMU */