This commit was generated by cvs2svn to compensate for changes in r5670,
[chise/xemacs-chise.git.1] / lwlib / xlwgauge.c
index db08040..a6c223b 100644 (file)
@@ -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
@@ -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 ;