From 96fd5bf4862bf16342088363b63a99e08a242f46 Mon Sep 17 00:00:00 2001 From: zsxxsz Date: Wed, 31 Oct 2018 22:14:09 +0800 Subject: [PATCH] build ok for windows --- acl_cpp_vc2012.sln | 8 ++++---- lib_fiber/c/include/fiber/fiber_define.h | 3 ++- lib_fiber/c/libfiber_vc2012.vcxproj | 1 + lib_fiber/c/libfiber_vc2012.vcxproj.filters | 3 +++ lib_fiber/c/src/common/sane_socket.c | 2 +- lib_fiber/c/src/common/tcp_nodelay.c | 2 +- lib_fiber/c/src/hook/getaddrinfo.c | 2 +- lib_fiber/c/src/hook/gethostbyname.c | 2 +- lib_fiber/c/src/hook/socket.c | 2 +- lib_fiber/c/src/stdafx.h | 2 +- lib_fiber/cpp/include/fiber/fiber_cpp_define.hpp | 3 ++- 11 files changed, 18 insertions(+), 12 deletions(-) diff --git a/acl_cpp_vc2012.sln b/acl_cpp_vc2012.sln index 34f26e4c3..ed855e561 100644 --- a/acl_cpp_vc2012.sln +++ b/acl_cpp_vc2012.sln @@ -3582,8 +3582,8 @@ Global {BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}.Template|x64.ActiveCfg = Release|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Win32.ActiveCfg = DebugDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Win32.Build.0 = DebugDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Win32.ActiveCfg = Debug|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|Win32.Build.0 = Debug|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Debug|x64.ActiveCfg = DebugDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32 @@ -3592,8 +3592,8 @@ Global {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.DebugDll|x64.ActiveCfg = DebugDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Mixed Platforms.Build.0 = Release|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Win32.ActiveCfg = ReleaseDll|Win32 - {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Win32.Build.0 = ReleaseDll|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Win32.ActiveCfg = Release|Win32 + {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|Win32.Build.0 = Release|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Release|x64.ActiveCfg = ReleaseDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32 {F74A61AD-A309-47A5-A7C6-BAC888660BBC}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32 diff --git a/lib_fiber/c/include/fiber/fiber_define.h b/lib_fiber/c/include/fiber/fiber_define.h index dc0ce5972..756afd2a2 100644 --- a/lib_fiber/c/include/fiber/fiber_define.h +++ b/lib_fiber/c/include/fiber/fiber_define.h @@ -11,7 +11,8 @@ typedef intptr_t acl_handle_t; #if defined(_WIN32) || defined (_WIN64) # include -typedef intptr_t ssize_t; +/* typedef intptr_t ssize_t; */ +typedef long ssize_t; typedef SOCKET socket_t; typedef int socklen_t; diff --git a/lib_fiber/c/libfiber_vc2012.vcxproj b/lib_fiber/c/libfiber_vc2012.vcxproj index 150d06c23..590dc231f 100644 --- a/lib_fiber/c/libfiber_vc2012.vcxproj +++ b/lib_fiber/c/libfiber_vc2012.vcxproj @@ -162,6 +162,7 @@ + diff --git a/lib_fiber/c/libfiber_vc2012.vcxproj.filters b/lib_fiber/c/libfiber_vc2012.vcxproj.filters index b036ded7c..3887e0088 100644 --- a/lib_fiber/c/libfiber_vc2012.vcxproj.filters +++ b/lib_fiber/c/libfiber_vc2012.vcxproj.filters @@ -34,6 +34,9 @@ + + doc + diff --git a/lib_fiber/c/src/common/sane_socket.c b/lib_fiber/c/src/common/sane_socket.c index a8be0b592..aa265a0ba 100644 --- a/lib_fiber/c/src/common/sane_socket.c +++ b/lib_fiber/c/src/common/sane_socket.c @@ -23,7 +23,7 @@ int is_listen_socket(socket_t fd) int getsocktype(socket_t fd) { - SOCKADDR addr; + SOCK_ADDR addr; struct sockaddr *sa = (struct sockaddr*) &addr; socklen_t len = sizeof(addr); diff --git a/lib_fiber/c/src/common/tcp_nodelay.c b/lib_fiber/c/src/common/tcp_nodelay.c index 92ac34f86..818eb0d49 100644 --- a/lib_fiber/c/src/common/tcp_nodelay.c +++ b/lib_fiber/c/src/common/tcp_nodelay.c @@ -5,7 +5,7 @@ static int getsocktype(socket_t fd) { - SOCKADDR addr; + SOCK_ADDR addr; struct sockaddr *sa = (struct sockaddr*) &addr; socklen_t len = sizeof(addr); diff --git a/lib_fiber/c/src/hook/getaddrinfo.c b/lib_fiber/c/src/hook/getaddrinfo.c index 7e72ab700..db7f3cabb 100644 --- a/lib_fiber/c/src/hook/getaddrinfo.c +++ b/lib_fiber/c/src/hook/getaddrinfo.c @@ -39,7 +39,7 @@ static struct addrinfo *create_addrinfo(const char *ip, short port, { struct addrinfo *res; size_t addrlen; - SOCKADDR sa; + SOCK_ADDR sa; if (is_ipv4(ip)) { sa.in.sin_family = AF_INET; diff --git a/lib_fiber/c/src/hook/gethostbyname.c b/lib_fiber/c/src/hook/gethostbyname.c index aa74827d4..8ffbf6a9e 100644 --- a/lib_fiber/c/src/hook/gethostbyname.c +++ b/lib_fiber/c/src/hook/gethostbyname.c @@ -114,7 +114,7 @@ static int save_result(struct hostent *ent, struct addrinfo *res, break; } - SOCKADDR *sa = (SOCKADDR *) ai->ai_addr; + SOCK_ADDR *sa = (SOCK_ADDR *) ai->ai_addr; if (ai->ai_family == AF_INET) { len = sizeof(struct in_addr); diff --git a/lib_fiber/c/src/hook/socket.c b/lib_fiber/c/src/hook/socket.c index f078d4421..1df4d090a 100644 --- a/lib_fiber/c/src/hook/socket.c +++ b/lib_fiber/c/src/hook/socket.c @@ -338,7 +338,7 @@ int WINAPI acl_fiber_connect(socket_t sockfd, const struct sockaddr *addr, len = sizeof(err); ret = getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char *) &err, &len); if (ret == 0 && err == 0) { - SOCKADDR saddr; + SOCK_ADDR saddr; struct sockaddr *sa = (struct sockaddr*) &saddr; socklen_t n = sizeof(saddr); diff --git a/lib_fiber/c/src/stdafx.h b/lib_fiber/c/src/stdafx.h index 077d3b869..7b3ba2f96 100644 --- a/lib_fiber/c/src/stdafx.h +++ b/lib_fiber/c/src/stdafx.h @@ -87,6 +87,6 @@ typedef union { struct sockaddr_un un; #endif struct sockaddr sa; -} SOCKADDR; +} SOCK_ADDR; #endif diff --git a/lib_fiber/cpp/include/fiber/fiber_cpp_define.hpp b/lib_fiber/cpp/include/fiber/fiber_cpp_define.hpp index 01443440d..8966586b2 100644 --- a/lib_fiber/cpp/include/fiber/fiber_cpp_define.hpp +++ b/lib_fiber/cpp/include/fiber/fiber_cpp_define.hpp @@ -1,7 +1,8 @@ #pragma once #if defined(_WIN32) || defined (_WIN64) -typedef intptr_t ssize_t; +/* typedef intptr_t ssize_t; */ +typedef long ssize_t; #else #include #include