--- a/src/process-nt.c	Sat Feb 06 03:59:18 2010 -0600
+++ b/src/process-nt.c	Sat Feb 06 04:01:46 2010 -0600
@@ -693,11 +693,10 @@
  */
 
 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);
+  signal_error_2 (Qnetwork_error, reason, mswindows_lisp_error (errnum), data);
 }
 
 static void
@@ -861,7 +860,7 @@
 	 args_or_ret);
 
     /* #### What about path names, which may be links? */
-    LISP_STRING_TO_TSTR (args_or_ret, command_line);
+    command_line = LISP_STRING_TO_TSTR (args_or_ret);
 
     UNGCPRO; /* args_or_ret */
   }
@@ -1237,7 +1236,7 @@
     Extbyte *hostext;
     unsigned long inaddr;
 
-    LISP_STRING_TO_EXTERNAL (host, hostext, Qmswindows_host_name_encoding);
+    hostext = LISP_STRING_TO_EXTERNAL (host, Qmswindows_host_name_encoding);
     inaddr = inet_addr (hostext);
     if (inaddr != INADDR_NONE)
       {
@@ -1255,7 +1254,7 @@
   {
     Extbyte *hostext;
 
-    LISP_STRING_TO_EXTERNAL (host, hostext, Qmswindows_host_name_encoding);
+    hostext = LISP_STRING_TO_EXTERNAL (host, Qmswindows_host_name_encoding);
 
     hasync = WSAAsyncGetHostByName (hwnd, XM_SOCKREPLY, hostext,
 				    buf, sizeof (buf));
@@ -1313,7 +1312,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;
 }
@@ -1348,8 +1348,8 @@
       Extbyte *servext;
 
       CHECK_STRING (service);
-      LISP_STRING_TO_EXTERNAL (service, servext,
-			       Qmswindows_service_name_encoding);
+      servext = LISP_STRING_TO_EXTERNAL (service,
+					 Qmswindows_service_name_encoding);
 
       svc_info = getservbyname (servext, "tcp");
       if (svc_info == 0)