diff options
| author | Yang Tse <yangsita@gmail.com> | 2013-01-09 13:03:53 +0100 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2013-01-09 22:23:49 +0100 |
| commit | a9ca5e61e533def9e430597e36d70e96aee8e27a (patch) | |
| tree | b0692fde66d6fe9c3ae9c2ef4e6c203bc05d8fbb /lib | |
| parent | 06558695d5fc8f41c3d3e6f79e467ac9a987349a (diff) | |
| download | curl-a9ca5e61e533def9e430597e36d70e96aee8e27a.tar.gz | |
sockfilt.c: fix some W64 compiler warnings
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/warnless.c | 24 | ||||
| -rw-r--r-- | lib/warnless.h | 14 |
2 files changed, 36 insertions, 2 deletions
diff --git a/lib/warnless.c b/lib/warnless.c index b1eaa96ea..7a4b01eb6 100644 --- a/lib/warnless.c +++ b/lib/warnless.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -378,6 +378,28 @@ size_t curlx_sitouz(int sinum) #endif } +#ifdef USE_WINSOCK + +/* +** curl_socket_t to signed int +*/ + +int curlx_sktosi(curl_socket_t s) +{ + return (int)((ssize_t) s); +} + +/* +** signed int to curl_socket_t +*/ + +curl_socket_t curlx_sitosk(int i) +{ + return (curl_socket_t)((ssize_t) i); +} + +#endif /* USE_WINSOCK */ + #if defined(__INTEL_COMPILER) && defined(__unix__) int curlx_FD_ISSET(int fd, fd_set *fdset) diff --git a/lib/warnless.h b/lib/warnless.h index 9d690d62c..f22f0bae4 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -22,6 +22,10 @@ * ***************************************************************************/ +#ifdef USE_WINSOCK +#include <curl/curl.h> /* for curl_socket_t */ +#endif + unsigned short curlx_ultous(unsigned long ulnum); unsigned char curlx_ultouc(unsigned long ulnum); @@ -48,6 +52,14 @@ int curlx_sztosi(ssize_t sznum); size_t curlx_sitouz(int sinum); +#ifdef USE_WINSOCK + +int curlx_sktosi(curl_socket_t s); + +curl_socket_t curlx_sitosk(int i); + +#endif /* USE_WINSOCK */ + #if defined(__INTEL_COMPILER) && defined(__unix__) int curlx_FD_ISSET(int fd, fd_set *fdset); |