diff options
Diffstat (limited to 'common/os_calls.c')
| -rw-r--r-- | common/os_calls.c | 75 |
1 files changed, 12 insertions, 63 deletions
diff --git a/common/os_calls.c b/common/os_calls.c index 4608f6b0..8a294971 100644 --- a/common/os_calls.c +++ b/common/os_calls.c @@ -332,13 +332,8 @@ int APP_CC g_tcp_set_no_delay(int sck) { int ret = 1; /* error */ -#if defined(_WIN32) - int option_value; - int option_len; -#else int option_value; - unsigned int option_len; -#endif + socklen_t option_len; option_len = sizeof(option_value); @@ -376,13 +371,8 @@ int APP_CC g_tcp_set_keepalive(int sck) { int ret = 1; /* error */ -#if defined(_WIN32) int option_value; - int option_len; -#else - int option_value; - unsigned int option_len; -#endif + socklen_t option_len; option_len = sizeof(option_value); @@ -422,11 +412,7 @@ g_tcp_socket(void) { int rv; int option_value; -#if defined(_WIN32) - int option_len; -#else - unsigned int option_len; -#endif + socklen_t option_len; #if defined(XRDP_ENABLE_IPV6) rv = (int)socket(AF_INET6, SOCK_STREAM, 0); @@ -500,11 +486,7 @@ int APP_CC g_sck_set_send_buffer_bytes(int sck, int bytes) { int option_value; -#if defined(_WIN32) - int option_len; -#else - unsigned int option_len; -#endif + socklen_t option_len; option_value = bytes; option_len = sizeof(option_value); @@ -522,11 +504,7 @@ int APP_CC g_sck_get_send_buffer_bytes(int sck, int *bytes) { int option_value; -#if defined(_WIN32) - int option_len; -#else - unsigned int option_len; -#endif + socklen_t option_len; option_value = 0; option_len = sizeof(option_value); @@ -545,11 +523,7 @@ int APP_CC g_sck_set_recv_buffer_bytes(int sck, int bytes) { int option_value; -#if defined(_WIN32) - int option_len; -#else - unsigned int option_len; -#endif + socklen_t option_len; option_value = bytes; option_len = sizeof(option_value); @@ -567,11 +541,7 @@ int APP_CC g_sck_get_recv_buffer_bytes(int sck, int *bytes) { int option_value; -#if defined(_WIN32) - int option_len; -#else - unsigned int option_len; -#endif + socklen_t option_len; option_value = 0; option_len = sizeof(option_value); @@ -601,11 +571,7 @@ int APP_CC g_sck_get_peer_cred(int sck, int *pid, int *uid, int *gid) { #if defined(SO_PEERCRED) -#if defined(_WIN32) - int ucred_length; -#else - unsigned int ucred_length; -#endif + socklen_t ucred_length; struct myucred { pid_t pid; @@ -1056,11 +1022,7 @@ g_tcp_accept(int sck) int ret ; char ipAddr[256] ; struct sockaddr_in s; -#if defined(_WIN32) - signed int i; -#else - unsigned int i; -#endif + socklen_t i; i = sizeof(struct sockaddr_in); memset(&s, 0, i); @@ -1081,11 +1043,7 @@ g_sck_accept(int sck, char *addr, int addr_bytes, char *port, int port_bytes) int ret; char ipAddr[256]; struct sockaddr_in s; -#if defined(_WIN32) - signed int i; -#else - unsigned int i; -#endif + socklen_t i; i = sizeof(struct sockaddr_in); memset(&s, 0, i); @@ -1115,11 +1073,7 @@ g_write_ip_address(int rcv_sck, char *ip_address, int bytes) { struct sockaddr_in s; struct in_addr in; -#if defined(_WIN32) - int len; -#else - unsigned int len; -#endif + socklen_t len; int ip_port; int ok; @@ -1196,13 +1150,8 @@ g_sck_send(int sck, const void *ptr, int len, int flags) int APP_CC g_sck_socket_ok(int sck) { -#if defined(_WIN32) int opt; - int opt_len; -#else - int opt; - unsigned int opt_len; -#endif + socklen_t opt_len; opt_len = sizeof(opt); |