Changeset 14383

Timestamp:

Dec 13, 2014, 4:00:14 PM (8 years ago)

Author:

mikedld

Message:

Don't mess with MinGW printf support for now (tricky)

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• configure.ac (modified) (1 diff)
• libtransmission/transmission.h (modified) (4 diffs)

trunk/CMakeLists.txt

@@ -350 +350 @@
 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)

trunk/configure.ac

@@ -453 +453 @@
      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"

trunk/libtransmission/transmission.h

@@ -45 +45 @@
 
 #ifndef PRId64
- #if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO))
+ #ifdef _WIN32
   #define PRId64 "I64"
  #else
@@ -53 +53 @@
 
 #ifndef PRIu64
- #if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO))
+ #ifdef _WIN32
   #define PRIu64 "I64u"
  #else
@@ -61 +61 @@
 
 #ifndef PRIu32
- #if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO))
+ #ifdef _WIN32
   #define PRIu32 "u"
  #else
@@ -69 +69 @@
 
 #ifndef TR_PRIuSIZE
- #if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO))
+ #ifdef _WIN32
   #define TR_PRIuSIZE "Iu"
  #else