diff src/frame-x.c @ 211:78478c60bfcd r20-4b4

Import from CVS: tag r20-4b4
author cvs
date Mon, 13 Aug 2007 10:05:51 +0200
parents 41ff10fd062f
children 1f0dabaa0855
line wrap: on
line diff
--- a/src/frame-x.c	Mon Aug 13 10:05:01 2007 +0200
+++ b/src/frame-x.c	Mon Aug 13 10:05:51 2007 +0200
@@ -1,5 +1,5 @@
 /* Functions for the X window system.
-   Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1992-5, 1997 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996 Ben Wing.
 
 This file is part of XEmacs.
@@ -1224,7 +1224,7 @@
 		}
 	      len = XSTRING_LENGTH (XCAR (run)) + 1;
 	      dnd_data = xrealloc (dnd_data, dnd_len + len);
-	      strcpy (dnd_data + dnd_len - 1, XSTRING_DATA (XCAR (run)));
+	      strcpy (dnd_data + dnd_len - 1, (CONST char *)XSTRING_DATA (XCAR (run)));
 	      dnd_len += len;
 	      run = XCDR (run);
 	    }
@@ -1239,7 +1239,7 @@
 	    return Qnil;
 
 	  /* and whats with MULE data ??? */
-	  dnd_data = XSTRING_DATA (data);
+	  dnd_data = (char *)XSTRING_DATA (data);
 	  dnd_len  = XSTRING_LENGTH (data) + 1; /* the zero */
 
 	}
@@ -1275,7 +1275,7 @@
       x_event.xbutton.button = lisp_event->event.button.button;
       x_event.xkey.same_screen = True;
 
-      DndSetData(dnd_typ, dnd_data, dnd_len);
+      DndSetData(dnd_typ, (unsigned char *)dnd_data, dnd_len);
       if (dnd_dealloc)
 	xfree (dnd_data);