mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-03 10:15:45 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Mike Gelfand 2014-12-13 16:00:14 +00:00
parent 52a9d774e4
commit 74a5bdb9e6
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -349,12 +349,12 @@ foreach(F ${NEEDED_FUNCTIONS})
endif() endif()
endforeach() endforeach()
if(MINGW) # if(MINGW)
check_function_exists(__mingw_printf HAVE_MINGW_PRINTF) # check_function_exists(__mingw_printf HAVE_MINGW_PRINTF)
if(HAVE_MINGW_PRINTF) # if(HAVE_MINGW_PRINTF)
add_definitions(-D__USE_MINGW_ANSI_STDIO=1 -D__STDC_FORMAT_MACROS=1) # add_definitions(-D__USE_MINGW_ANSI_STDIO=1 -D__STDC_FORMAT_MACROS=1)
endif() # endif()
endif() # endif()
check_library_exists(m sqrt "" HAVE_LIBM) check_library_exists(m sqrt "" HAVE_LIBM)
if(HAVE_LIBM) if(HAVE_LIBM)

2
configure.ac
View file

@ -452,7 +452,7 @@ case $host_os in
have_msw="yes" have_msw="yes"
CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows" CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 -DWIN32_LEAN_AND_MEAN" 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" LIBS="$LIBS -liphlpapi -lshell32 -lws2_32"
transmissionlocaledir="locale" transmissionlocaledir="locale"
if test -z "$host_alias"; then if test -z "$host_alias"; then

8
libtransmission/transmission.h
View file

@ -44,7 +44,7 @@ extern "C" {
#endif #endif
#ifndef PRId64 #ifndef PRId64
#if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO)) #ifdef _WIN32
#define PRId64 "I64" #define PRId64 "I64"
#else #else
#define PRId64 "lld" #define PRId64 "lld"
@ -52,7 +52,7 @@ extern "C" {
#endif #endif
#ifndef PRIu64 #ifndef PRIu64
#if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO)) #ifdef _WIN32
#define PRIu64 "I64u" #define PRIu64 "I64u"
#else #else
#define PRIu64 "llu" #define PRIu64 "llu"
@ -60,7 +60,7 @@ extern "C" {
#endif #endif
#ifndef PRIu32 #ifndef PRIu32
#if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO)) #ifdef _WIN32
#define PRIu32 "u" #define PRIu32 "u"
#else #else
#define PRIu32 "lu" #define PRIu32 "lu"
@ -68,7 +68,7 @@ extern "C" {
#endif #endif
#ifndef TR_PRIuSIZE #ifndef TR_PRIuSIZE
#if defined (_MSC_VER) || (defined (__MINGW32__) && !defined (__USE_MINGW_ANSI_STDIO)) #ifdef _WIN32
#define TR_PRIuSIZE "Iu" #define TR_PRIuSIZE "Iu"
#else #else
#define TR_PRIuSIZE "zu" #define TR_PRIuSIZE "zu"