From cefc47791801b1b350619a81d1c5be1a5c6bd12b Mon Sep 17 00:00:00 2001 From: Mike Gelfand Date: Thu, 19 Mar 2015 19:13:23 +0000 Subject: [PATCH] Fix a couple more MinGW/MSVC warnings. --- daemon/watch.c | 2 +- libtransmission/file-win32.c | 2 +- libtransmission/tr-dht.c | 2 ++ libtransmission/utils.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/daemon/watch.c b/daemon/watch.c index a3e83d84d..4fee35c21 100644 --- a/daemon/watch.c +++ b/daemon/watch.c @@ -235,7 +235,7 @@ watchdir_update_impl (dtr_watchdir * w) ***/ dtr_watchdir* -dtr_watchdir_new (tr_session * session, const char * dir, dtr_watchdir_callback * callback) +dtr_watchdir_new (tr_session * session, const char * dir, dtr_watchdir_callback callback) { dtr_watchdir * w = tr_new0 (dtr_watchdir, 1); diff --git a/libtransmission/file-win32.c b/libtransmission/file-win32.c index 8138d56e2..4c6ec6653 100644 --- a/libtransmission/file-win32.c +++ b/libtransmission/file-win32.c @@ -52,7 +52,7 @@ set_system_error (tr_error ** error, } else { - tr_error_set (error, code, "Unknown error: 0x%08x", code); + tr_error_set (error, code, "Unknown error: 0x%08lx", code); } } diff --git a/libtransmission/tr-dht.c b/libtransmission/tr-dht.c index 2016c8d1d..8d34fa954 100644 --- a/libtransmission/tr-dht.c +++ b/libtransmission/tr-dht.c @@ -35,6 +35,8 @@ #ifdef _WIN32 #include #include + #undef gai_strerror + #define gai_strerror gai_strerrorA #else #include #include diff --git a/libtransmission/utils.h b/libtransmission/utils.h index beb3ff3ac..18aacb9ce 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -87,7 +87,7 @@ extern "C" { #elif __has_feature (c_static_assert) || __has_extension (c_static_assert) #define TR_STATIC_ASSERT _Static_assert #else - #define TR_STATIC_ASSERT(x, msg) { const char static_check[((x) ? 1 : -1)] UNUSED; } + #define TR_STATIC_ASSERT(x, msg) { typedef char __tr_static_check__[(x) ? 1 : -1] UNUSED; } #endif -- 2.40.0