From: Sen Huang <senhuang96@fb.com>
Date: Tue, 8 Oct 2019 13:54:59 +0000 (-0400)
Subject: Casting to void* to avoid C4090 warnings
X-Git-Tag: v1.4.4~1^2~36^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e406b55eeeaa3ce1175459fda4044cbf248e0d1;p=thirdparty%2Fzstd.git

Casting to void* to avoid C4090 warnings
---

diff --git a/programs/fileio.c b/programs/fileio.c
index 9ac65abcb..81633947f 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -658,13 +658,7 @@ int FIO_checkFilenameCollisions(const char** filenameTable, unsigned nbFiles) {
         }
     }
 
-    /* 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);
+    qsort((void*)filenameTableSorted, nbFiles, sizeof(char*), UTIL_compareStr);
     prevElem = filenameTableSorted[0];
     for (u = 1; u < nbFiles; ++u) {
         if (strcmp(prevElem, filenameTableSorted[u]) == 0) {
@@ -673,11 +667,7 @@ int FIO_checkFilenameCollisions(const char** filenameTable, unsigned nbFiles) {
         prevElem = filenameTableSorted[u];
     }
 
-    free(filenameTableSorted);
-
-    #if defined(_MSC_VER) || defined(__MINGW32__) || defined (__MSVCRT__)
-    #pragma warning (pop)
-    #endif
+    free((void*)filenameTableSorted);
     return 0;
 }