X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lwlib%2Fxlwgauge.c;h=7364fd1a845541b23340089ce09f96eaebd481ca;hb=bc2aef083d7f2793bbe075d63fb0670ffa1ffe89;hp=de71df05227440491bdf789ef290fcdb76636744;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git

diff --git a/lwlib/xlwgauge.c b/lwlib/xlwgauge.c
index de71df0..7364fd1 100644
--- a/lwlib/xlwgauge.c
+++ b/lwlib/xlwgauge.c
@@ -132,14 +132,14 @@ static void EnableUpdate  (GaugeWidget);
 static void DisableUpdate (GaugeWidget);
 
 static void GaugeGetValue (XtPointer, XtIntervalId *);
-static void GaugeMercury (Display *, Window, GC, GaugeWidget, Cardinal, Cardinal);
+static void GaugeMercury (Display *, Window, GC, GaugeWidget, int, int);
 
 static Boolean GaugeConvert (Widget, Atom *, Atom *, Atom *,
-			     XtPointer *, u_long *, int *);
+			     XtPointer *, unsigned long *, int *);
 static void GaugeLoseSel (Widget, Atom *);
 static void GaugeDoneSel (Widget, Atom *, Atom *);
 static void GaugeGetSelCB (Widget, XtPointer, Atom *, Atom *,
-			   XtPointer, u_long *, int *);
+			   XtPointer, unsigned long *, int *);
 
 static GC Get_GC (GaugeWidget, Pixel);
 
@@ -636,7 +636,7 @@ GaugeConvert (Widget	w,
 	      Atom	*target,	/* requested target */
 	      Atom	*type,		/* returned type */
 	      XtPointer *value,		/* returned value */
-	      u_long	*length,	/* returned length */
+	      unsigned long	*length,	/* returned length */
 	      int	*format)	/* returned format */
 {
 	GaugeWidget	gw = (GaugeWidget)w ;
@@ -650,7 +650,7 @@ GaugeConvert (Widget	w,
 	if( *target == XA_TARGETS(XtDisplay(w)) )
 	{
 	  Atom *rval, *stdTargets ;
-	  u_long stdLength ;
+	  unsigned long stdLength ;
 
 	  /* XmuConvertStandardSelection can handle this.  This function
 	   * will return a list of standard targets.  We prepend TEXT,
@@ -774,7 +774,7 @@ GaugeGetSelCB (Widget    w,
 	       Atom      *selection,
 	       Atom      *type,
 	       XtPointer value,
-	       u_long    *length,
+	       unsigned long    *length,
 	       int       *format)
 {
 	Display	*dpy = XtDisplay(w) ;
@@ -819,8 +819,7 @@ GaugeGetSelCB (Widget    w,
 	 */
 
 void
-XawGaugeSetValue (Widget   w,
-		  Cardinal value)
+XawGaugeSetValue (Widget w, int value)
 {
 	GaugeWidget gw = (GaugeWidget)w ;
 	int	oldvalue ;
@@ -852,7 +851,7 @@ XawGaugeSetValue (Widget   w,
 }
 
 
-Cardinal
+int
 XawGaugeGetValue (Widget w)
 {
 	GaugeWidget gw = (GaugeWidget)w ;
@@ -875,8 +874,8 @@ GaugeMercury (Display     *dpy,
 	      Window      win,
 	      GC          gc,
 	      GaugeWidget gw,
-	      Cardinal    val0,
-	      Cardinal    val1)
+	      int    val0,
+	      int    val1)
 {
 	int	v0 = gw->gauge.v0 ;
 	int	v1 = gw->gauge.v1 ;
@@ -1110,7 +1109,7 @@ GaugeGetValue (XtPointer    clientData,
 	       XtIntervalId *intervalId)
 {
 	GaugeWidget	gw = (GaugeWidget)clientData ;
-	Cardinal	value ;
+	int	value ;
 
 	if( gw->gauge.update > 0 )
 	  EnableUpdate(gw) ;