@@ -695,14 +695,14 @@ x_check_status(int status,
{
if (extended_msg)
{
- msg(x_cs_info_level, "%s %s [%s]: %s (fd=%d,code=%d)", description,
+ msg(x_cs_info_level, "%s %s [%s]: %s (fd=" SOCKET_PRINTF ",code=%d)", description,
sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "",
extended_msg, openvpn_strerror(my_errno, crt_error, &gc),
sock ? sock->sd : -1, my_errno);
}
else
{
- msg(x_cs_info_level, "%s %s: %s (fd=%d,code=%d)", description,
+ msg(x_cs_info_level, "%s %s: %s (fd=" SOCKET_PRINTF ",code=%d)", description,
sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "",
openvpn_strerror(my_errno, crt_error, &gc),
sock ? sock->sd : -1, my_errno);
@@ -442,9 +442,11 @@ typedef unsigned short sa_family_t;
*/
#ifdef _WIN32
#define SOCKET_UNDEFINED (INVALID_SOCKET)
+#define SOCKET_PRINTF "%lld"
typedef SOCKET socket_descriptor_t;
#else
#define SOCKET_UNDEFINED (-1)
+#define SOCKET_PRINTF "%d"
typedef int socket_descriptor_t;
#endif
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> --- src/openvpn/error.c | 4 ++-- src/openvpn/syshead.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)