From 75e6cabe0530693aeaae64f88a981e90e998746e Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Sat, 3 Jan 2009 01:55:17 +0000 Subject: [PATCH] mingw fixes (SF#2209829: https://sourceforge.net/tracker2/?func=detail&aid=2209829&group_id=13478&atid=313478) --- doc/html/changelog.html | 1 + src/share/replaygain_analysis/replaygain_analysis.c | 4 ++-- src/share/utf8/utf8.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/html/changelog.html b/doc/html/changelog.html index fcf4530..3c11cea 100644 --- a/doc/html/changelog.html +++ b/doc/html/changelog.html @@ -104,6 +104,7 @@
  • build system: diff --git a/src/share/replaygain_analysis/replaygain_analysis.c b/src/share/replaygain_analysis/replaygain_analysis.c index c64231f..027b0ad 100644 --- a/src/share/replaygain_analysis/replaygain_analysis.c +++ b/src/share/replaygain_analysis/replaygain_analysis.c @@ -159,7 +159,7 @@ static Uint32_t B [12000]; /* for each filter: [0] 48 kHz, [1] 44.1 kHz, [2] 32 kHz, [3] 24 kHz, [4] 22050 Hz, [5] 16 kHz, [6] 12 kHz, [7] is 11025 Hz, [8] 8 kHz */ -#ifdef WIN32 +#ifdef _MSC_VER #pragma warning ( disable : 4305 ) #endif @@ -211,7 +211,7 @@ static const Float_t BButter [9] [3] = { { 0.94597685600279, -1.89195371200558, 0.94597685600279 } }; -#ifdef WIN32 +#ifdef _MSC_VER #pragma warning ( default : 4305 ) #endif diff --git a/src/share/utf8/utf8.c b/src/share/utf8/utf8.c index 303fe23..75a2505 100644 --- a/src/share/utf8/utf8.c +++ b/src/share/utf8/utf8.c @@ -155,7 +155,7 @@ int utf8_encode(const char *from, char **to) if(wchars == 0) { - fprintf(stderr, "Unicode translation error %d\n", GetLastError()); + fprintf(stderr, "Unicode translation error %d\n", (int)GetLastError()); return -1; } @@ -174,7 +174,7 @@ int utf8_encode(const char *from, char **to) if(err != wchars) { free(unicode); - fprintf(stderr, "Unicode translation error %d\n", GetLastError()); + fprintf(stderr, "Unicode translation error %d\n", (int)GetLastError()); return -1; } @@ -210,7 +210,7 @@ int utf8_decode(const char *from, char **to) if(chars == 0) { - fprintf(stderr, "Unicode translation error %d\n", GetLastError()); + fprintf(stderr, "Unicode translation error %d\n", (int)GetLastError()); free(unicode); return -1; } @@ -227,7 +227,7 @@ int utf8_decode(const char *from, char **to) -1, *to, chars, NULL, NULL); if(err != chars) { - fprintf(stderr, "Unicode translation error %d\n", GetLastError()); + fprintf(stderr, "Unicode translation error %d\n", (int)GetLastError()); free(unicode); free(*to); *to = NULL; -- 2.7.4