Mercurial > hg > xemacs-beta

diff src/process-nt.c @ 4959:bd169a24a554

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Thu, 28 Jan 2010 04:27:30 -0600
parents 304aebb79cd3
children 4aebb0131297
line wrap: on
line diff
--- a/src/process-nt.c	Thu Jan 28 04:02:14 2010 -0600
+++ b/src/process-nt.c	Thu Jan 28 04:27:30 2010 -0600
@@ -693,11 +693,11 @@
  */
 
 static DOESNT_RETURN
-mswindows_report_winsock_error (const char *string, Lisp_Object data,
+mswindows_report_winsock_error (const Ascbyte *reason, Lisp_Object data,
 				int errnum)
 {
   report_file_type_error (Qnetwork_error, mswindows_lisp_error (errnum),
-			  string, data);
+			  reason, data);
 }
 
 static void
@@ -1313,7 +1313,8 @@
     return host;
 
   if (address.sin_family == AF_INET)
-    return build_string (inet_ntoa (address.sin_addr));
+    return build_extstring (inet_ntoa (address.sin_addr),
+			     Qunix_host_name_encoding);
   else
     return host;
 }