Revision: 14574 Author: adrian.chadd Date: Sat Apr 10 19:33:58 2010 Log: Issue #94 - fix win32_pipe compilation issue under native windows
http://code.google.com/p/lusca-cache/source/detail?r=14574 Modified: /branches/LUSCA_HEAD/libiapp/win32_pipe.c ======================================= --- /branches/LUSCA_HEAD/libiapp/win32_pipe.c Sat Apr 10 17:59:16 2010 +++ /branches/LUSCA_HEAD/libiapp/win32_pipe.c Sat Apr 10 19:33:58 2010 @@ -53,6 +53,7 @@ #include <psapi.h> #endif +#include "../include/util.h" #include "../include/win32_error.h" #include "../include/win32_version.h" @@ -72,11 +73,6 @@ #include "comm_types.h" #include "comm.h" -THREADLOCAL int ws32_result; -THREADLOCAL int _so_err; -THREADLOCAL int _so_err_siz = sizeof(int); -LPCRITICAL_SECTION dbg_mutex = NULL; - /* internal to Microsoft CRTLIB */ #define FPIPE 0x08 /* file handle refers to a pipe */ typedef struct { @@ -147,13 +143,16 @@ } closesocket(new_socket); + /* XXX fix! */ F = &fd_table[handles[0]]; - F->local_addr = local_addr; + sqinet_init(&F->local_address); + sqinet_set_v4_inaddr(&F->local_address, &local_addr); F->local_port = ntohs(serv_addr.sin_port); F = &fd_table[handles[1]]; - F->local_addr = local_addr; - xstrncpy(F->ipaddr, inet_ntoa(local_addr), 16); + sqinet_init(&F->local_address); + sqinet_set_v4_inaddr(&F->local_address, &local_addr); + xstrncpy(F->ipaddrstr, inet_ntoa(local_addr), 16); F->remote_port = handle1_port; return 0; -- You received this message because you are subscribed to the Google Groups "lusca-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/lusca-commit?hl=en.
