Mercurial > hg > xemacs-beta
diff src/process-nt.c @ 4985:358aa3bb603f
Automatic merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 12:12:28 -0600 |
| parents | 4aebb0131297 |
| children | b5df3737028a |
line wrap: on
line diff
--- a/src/process-nt.c Fri Feb 05 12:11:12 2010 -0600 +++ b/src/process-nt.c Fri Feb 05 12:12:28 2010 -0600 @@ -696,8 +696,7 @@ mswindows_report_winsock_error (const Ascbyte *reason, Lisp_Object data, int errnum) { - report_file_type_error (Qnetwork_error, mswindows_lisp_error (errnum), - reason, 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)); @@ -1349,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)