X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lwlib%2Fxlwgauge.c;h=a6c223b3162236bcb4c19a27db8a13c664bcbe83;hb=131844b7560952b4f8e1cb8628d9115e0f2f29d2;hp=3d81e8f7793f900743bae4e1743a03dcac39007c;hpb=3890a2e3064a7f562107c58e59d928284ec04741;p=chise%2Fxemacs-chise.git

diff --git a/lwlib/xlwgauge.c b/lwlib/xlwgauge.c
index 3d81e8f..a6c223b 100644
--- a/lwlib/xlwgauge.c
+++ b/lwlib/xlwgauge.c
@@ -52,7 +52,7 @@ Boston, MA 02111-1307, USA.  */
 #include <X11/IntrinsicP.h>
 #include <X11/Xatom.h>
 #include <X11/StringDefs.h>
-#include ATHENA_INCLUDE(XawInit.h)
+#include <X11/Xaw/XawInit.h>
 #include "xlwgaugeP.h"
 #include "../src/xmu.h"
 #ifdef HAVE_XMU
@@ -466,7 +466,7 @@ register Window	win = XtWindow(w) ;
 	if( gw->gauge.nlabels > 1 )
 	{
 	  char	label[20], *s = label ;
-	  int	xlen, wd,h =0 ;
+	  int	len, w,h =0 ;
 
 	  if( gw->gauge.orientation == XtorientHorizontal )
 	    y = gw->gauge.lmargin + gw->label.font->max_bounds.ascent - 1 ;
@@ -483,13 +483,13 @@ register Window	win = XtWindow(w) ;
 	      s = gw->gauge.labels[i] ;
 	    if( s != NULL ) {
 	      x = e0 + i*(e1-e0-1)/(gw->gauge.nlabels-1) ;
-	      xlen = strlen(s) ;
+	      len = strlen(s) ;
 	      if( gw->gauge.orientation == XtorientHorizontal ) {
-		wd = XTextWidth(gw->label.font, s, xlen) ;
-		XDrawString(dpy,win,gc, x-wd/2,y, s,xlen) ;
+		w = XTextWidth(gw->label.font, s, len) ;
+		XDrawString(dpy,win,gc, x-w/2,y, s,len) ;
 	      }
 	      else {
-		XDrawString(dpy,win,gc, y,x+h, s,xlen) ;
+		XDrawString(dpy,win,gc, y,x+h, s,len) ;
 	      }
 	    }
 	  }
@@ -668,7 +668,7 @@ GaugeConvert (Widget	w,
 	  *rval++ = XA_INTEGER ;
 	  *rval++ = XA_STRING ;
 	  *rval++ = XA_TEXT(XtDisplay(w)) ;
-	  memcpy((char *)rval, (char *)stdTargets, stdLength*sizeof(Atom)) ;
+	  bcopy((char *)stdTargets, (char *)rval, stdLength*sizeof(Atom)) ;
 	  XtFree((char*) stdTargets) ;
 	  *format = 8*sizeof(Atom) ;	/* TODO: needed? */
 	  return True ;