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

merge
author Ben Wing <ben@xemacs.org>
date Thu, 28 Jan 2010 04:27:30 -0600
parents 304aebb79cd3
children 4aebb0131297
comparison
equal deleted inserted replaced
4893:99f2102552d7 4959:bd169a24a554
691 * which fits into Lisp_Int. No return value indicates an error, the method 691 * which fits into Lisp_Int. No return value indicates an error, the method
692 * must signal an error instead. 692 * must signal an error instead.
693 */ 693 */
694 694
695 static DOESNT_RETURN 695 static DOESNT_RETURN
696 mswindows_report_winsock_error (const char *string, Lisp_Object data, 696 mswindows_report_winsock_error (const Ascbyte *reason, Lisp_Object data,
697 int errnum) 697 int errnum)
698 { 698 {
699 report_file_type_error (Qnetwork_error, mswindows_lisp_error (errnum), 699 report_file_type_error (Qnetwork_error, mswindows_lisp_error (errnum),
700 string, data); 700 reason, data);
701 } 701 }
702 702
703 static void 703 static void
704 ensure_console_window_exists (void) 704 ensure_console_window_exists (void)
705 { 705 {
1311 1311
1312 if (get_internet_address (host, &address)) /* error */ 1312 if (get_internet_address (host, &address)) /* error */
1313 return host; 1313 return host;
1314 1314
1315 if (address.sin_family == AF_INET) 1315 if (address.sin_family == AF_INET)
1316 return build_string (inet_ntoa (address.sin_addr)); 1316 return build_extstring (inet_ntoa (address.sin_addr),
1317 Qunix_host_name_encoding);
1317 else 1318 else
1318 return host; 1319 return host;
1319 } 1320 }
1320 1321
1321 /* open a TCP network connection to a given HOST/SERVICE. Treated 1322 /* open a TCP network connection to a given HOST/SERVICE. Treated