diff src/event-msw.c @ 4982:3c3c1d139863

Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 11:25:00 -0600
parents 4aebb0131297 16112448d484
children ae48681c47fa
line wrap: on
line diff
--- a/src/event-msw.c	Fri Feb 05 11:02:24 2010 -0600
+++ b/src/event-msw.c	Fri Feb 05 11:25:00 2010 -0600
@@ -832,7 +832,7 @@
 
   if (str->buffer)
     {
-      xfree (str->buffer, void *);
+      xfree (str->buffer);
       str->buffer = 0;
     }
 
@@ -2113,7 +2113,7 @@
 	       they don't allow relative paths at all!  this is way bogus. */
 	    cmd = urlify_filename (cmd);
 	    l_dndlist = build_istring (cmd);
-	    xfree (cmd, Ibyte *);
+	    xfree (cmd);
 	  }
 	  GCPRO2 (emacs_event, l_dndlist);
 
@@ -2743,7 +2743,7 @@
 				((LCID) GetKeyboardLayout (0) & 0xFFFF),
 				NULL));
 		    ch = itext_ichar (intchar);
-		    xfree (intchar, Ibyte *);
+		    xfree (intchar);
 		  }
 
 #ifdef DEBUG_XEMACS
@@ -2887,7 +2887,7 @@
 
 				XSET_EVENT_KEY_ALT_KEYCHARS
 				  (lastev, i, itext_ichar (intchar));
-				xfree (intchar, Ibyte *);
+				xfree (intchar);
 			      }
 			  }
 		      }
@@ -3407,8 +3407,7 @@
 		   * recursion here. */
 		  if (FRAME_MSWINDOWS_TARGET_RECT (frame))
 		    {
-		      xfree (FRAME_MSWINDOWS_TARGET_RECT (frame),
-			     XEMACS_RECT_WH *);
+		      xfree (FRAME_MSWINDOWS_TARGET_RECT (frame));
 		      FRAME_MSWINDOWS_TARGET_RECT (frame) = 0;
 		    }
 		}
@@ -3728,9 +3727,9 @@
 	    {
 	      Ibyte *fname2 = urlify_filename (fname);
 	      l_item = build_istring (fname2);
-	      xfree (fname2, Ibyte *);
+	      xfree (fname2);
 	      if (freeme)
-		xfree (fname, Ibyte *);
+		xfree (fname);
 	      l_dndlist = Fcons (l_item, l_dndlist);
 	    }
 	  }