Relevant defines/typedefs:
typedef UINT_PTR SOCKET;
if defined(_WIN64)
typedef unsigned __int64 UINT_PTR;
else
typedef unsigned int UINT_PTR;
endif
ifdef _WIN64
define PRIuPTR PRIu64
else
define PRIuPTR PRIu32
endif
Remove duplicated include of inttypes.h
Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com>
---
src/openvpn/error.c | 4 ++--
src/openvpn/syshead.h | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
v2:
- use PRIuPTR as discussed on IRC (added relevant defines to
commit message)
- remove redundant include for inttypes.h from syshead.h
diff --git a/src/openvpn/error.c b/src/openvpn/error.c
index 89a08cec..a2c9aa4c 100644
--- a/src/openvpn/error.c
+++ b/src/openvpn/error.c
@@ -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);
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index fe91bc11..12ccf2f4 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -48,7 +48,6 @@
#ifdef _MSC_VER /* Visual Studio */
#define __func__ __FUNCTION__
#define __attribute__(x)
-#include <inttypes.h>
#endif
#if defined(__APPLE__)
@@ -442,9 +441,11 @@ typedef unsigned short sa_family_t;
*/
#ifdef _WIN32
#define SOCKET_UNDEFINED (INVALID_SOCKET)
+#define SOCKET_PRINTF "%" PRIuPTR
typedef SOCKET socket_descriptor_t;
#else
#define SOCKET_UNDEFINED (-1)
+#define SOCKET_PRINTF "%d"
typedef int socket_descriptor_t;
#endif
--
2.34.1
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
