Casting to void* to avoid C4090 warnings

diff --git a/programs/fileio.c b/programs/fileio.c
index 9ac65abcbbacdf0018738238cee5d489f5457114..81633947f8ffa4da03972f45d2d0112194b5caaf 100644 (file)
--- 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;
 }