From: Sen Huang <senhuang96@fb.com>
Date: Tue, 8 Oct 2019 13:44:24 +0000 (-0400)
Subject: Suppress C4090 warning
X-Git-Tag: v1.4.4~1^2~36^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=332b5988d8f080aca68901e371b70451f7061fd8;p=thirdparty%2Fzstd.git

Suppress C4090 warning
---

diff --git a/programs/fileio.c b/programs/fileio.c
index cc495b858..9ac65abcb 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -658,7 +658,13 @@ int FIO_checkFilenameCollisions(const char** filenameTable, unsigned nbFiles) {
         }
     }
 
-    qsort((const char**)filenameTableSorted, nbFiles, sizeof(char*), UTIL_compareStr);
+    /* Silence VS Compiler bug with warning C4090 */
+    #if defined(_MSC_VER) || defined(__MINGW32__) || defined (__MSVCRT__)
+    #pragma warning (push)
+    #pragma warning (disable : 4090)
+    #endif
+
+    qsort(filenameTableSorted, nbFiles, sizeof(char*), UTIL_compareStr);
     prevElem = filenameTableSorted[0];
     for (u = 1; u < nbFiles; ++u) {
         if (strcmp(prevElem, filenameTableSorted[u]) == 0) {
@@ -667,7 +673,11 @@ int FIO_checkFilenameCollisions(const char** filenameTable, unsigned nbFiles) {
         prevElem = filenameTableSorted[u];
     }
 
-    free((const char**)filenameTableSorted);
+    free(filenameTableSorted);
+
+    #if defined(_MSC_VER) || defined(__MINGW32__) || defined (__MSVCRT__)
+    #pragma warning (pop)
+    #endif
     return 0;
 }