From 74a5bdb9e65b5b4d9080cf86c8036df2902185be Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@mikedld.com>
Date: Sat, 13 Dec 2014 16:00:14 +0000
Subject: [PATCH] Don't mess with MinGW printf support for now (tricky)

---
 CMakeLists.txt                 | 12 ++++++------
 configure.ac                   |  2 +-
 libtransmission/transmission.h |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42168f651..51d856c36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -349,12 +349,12 @@ foreach(F ${NEEDED_FUNCTIONS})
     endif()
 endforeach()
 
-if(MINGW)
-    check_function_exists(__mingw_printf HAVE_MINGW_PRINTF)
-    if(HAVE_MINGW_PRINTF)
-        add_definitions(-D__USE_MINGW_ANSI_STDIO=1 -D__STDC_FORMAT_MACROS=1)
-    endif()
-endif()
+# if(MINGW)
+#     check_function_exists(__mingw_printf HAVE_MINGW_PRINTF)
+#     if(HAVE_MINGW_PRINTF)
+#         add_definitions(-D__USE_MINGW_ANSI_STDIO=1 -D__STDC_FORMAT_MACROS=1)
+#     endif()
+# endif()
 
 check_library_exists(m sqrt "" HAVE_LIBM)
 if(HAVE_LIBM)
diff --git a/configure.ac b/configure.ac
index 4eddefaab..8e937e422 100644
--- a/configure.ac
+++ b/configure.ac
@@ -452,7 +452,7 @@ case $host_os in
      have_msw="yes"
      CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
      CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 -DWIN32_LEAN_AND_MEAN"
-     CPPFLAGS="$CPPFLAGS -D__USE_MINGW_ANSI_STDIO=1 -D__STDC_FORMAT_MACROS=1"
+     # CPPFLAGS="$CPPFLAGS -D__USE_MINGW_ANSI_STDIO=1 -D__STDC_FORMAT_MACROS=1"
      LIBS="$LIBS -liphlpapi -lshell32 -lws2_32"
      transmissionlocaledir="locale"
      if test -z "$host_alias"; then
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 332178723..888c0c348 100644
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -44,7 +44,7 @@ extern "C" {
 #endif
 
 #ifndef PRId64
- #if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO))
+ #ifdef _WIN32
   #define PRId64 "I64"
  #else
   #define PRId64 "lld"
@@ -52,7 +52,7 @@ extern "C" {
 #endif
 
 #ifndef PRIu64
- #if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO))
+ #ifdef _WIN32
   #define PRIu64 "I64u"
  #else
   #define PRIu64 "llu"
@@ -60,7 +60,7 @@ extern "C" {
 #endif
 
 #ifndef PRIu32
- #if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO))
+ #ifdef _WIN32
   #define PRIu32 "u"
  #else
   #define PRIu32 "lu"
@@ -68,7 +68,7 @@ extern "C" {
 #endif
 
 #ifndef TR_PRIuSIZE
- #if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO))
+ #ifdef _WIN32
   #define TR_PRIuSIZE "Iu"
  #else
   #define TR_PRIuSIZE "zu"