mingw fixes (SF#2209829: https://sourceforge.net/tracker2/?func=detail&aid=2209829...

diff --git a/doc/html/changelog.html b/doc/html/changelog.html
index fcf4530..3c11cea 100644 (file)
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -104,6 +104,7 @@
                        <li>
                                build system:
                                <ul>
+                                       <li>Fixes for MinGW (<a href="https://sourceforge.net/tracker2/?func=detail&aid=2209829&group_id=13478&atid=113478">SF #2209829</a>).</li>
                                        <li>Fixes for gcc 4.3 (<a href="https://sourceforge.net/tracker2/?func=detail&aid=1834168&group_id=13478&atid=113478">SF #1834168</a>, <a href="https://sourceforge.net/tracker2/?func=detail&aid=2002481&group_id=13478&atid=113478">SF #2002481</a>).</li>
                                        <li>Fixes for windows builds (<a href="https://sourceforge.net/tracker2/?func=detail&aid=1676822&group_id=13478&atid=113478">SF #1676822</a>, <a href="https://sourceforge.net/tracker2/?func=detail&aid=1756624&group_id=13478&atid=363478">SF #1756624</a>, <a href="https://sourceforge.net/tracker2/?func=detail&aid=1809863&group_id=13478&atid=113478">SF #1809863</a>, <a href="https://sourceforge.net/tracker2/?func=detail&aid=1911149&group_id=13478&atid=363478">SF #1911149</a>).</li>
                                </ul>

diff --git a/src/share/replaygain_analysis/replaygain_analysis.c b/src/share/replaygain_analysis/replaygain_analysis.c
index c64231f..027b0ad 100644 (file)
--- 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 (file)
--- 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;