diff src/realpath.c @ 4990:8f0cf4fd3d2c

Automatic merge
author Ben Wing <ben@xemacs.org>
date Sat, 06 Feb 2010 04:01:46 -0600
parents 3c3c1d139863
children 308d34e9f07d
line wrap: on
line diff
--- a/src/realpath.c	Sat Feb 06 03:59:18 2010 -0600
+++ b/src/realpath.c	Sat Feb 06 04:01:46 2010 -0600
@@ -162,7 +162,7 @@
 	      return -1;
 	    }
 	  memcpy (buf, tmp, len);
-	  xfree (tmp, Ibyte *);
+	  xfree (tmp);
 	  return len;
 	}
     }
@@ -218,7 +218,7 @@
 	Extbyte *nameext;
 	HANDLE dir_handle;
 
-	C_STRING_TO_TSTR (name, nameext);
+	nameext = ITEXT_TO_TSTR (name);
 	dir_handle = qxeFindFirstFile (nameext, &find_data);
 	if (dir_handle == INVALID_HANDLE_VALUE)
 	  {
@@ -464,6 +464,6 @@
 vars_of_realpath (void)
 {
   QSin_qxe_realpath =
-    build_msg_string ("(in qxe_realpath)");
+    build_defer_string ("(in qxe_realpath)");
   staticpro (&QSin_qxe_realpath);
 }