Merge pull request #114 from TheVice/add_support_of_up_to_date_compilers

[programs] add support for up-to-date compilers.
Cyan4973 · Mar 9, 2024 · dc9bfc7 · dc9bfc7
2 parents 7149fa4 + d0a50f3
commit dc9bfc7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/programs/fileio.c b/programs/fileio.c
@@ -401,7 +401,7 @@ unsigned long long FIO_compressFilename(const char* output_filename, const char*
             break;
         }
 
-        DISPLAYUPDATE(2, "\rRead : %u MB  ==> %.2f%%   ", (U32)(filesize>>20), (double)compressedfilesize/filesize*100);
+        DISPLAYUPDATE(2, "\rRead : %u MB  ==> %.2f%%   ", (U32)(filesize>>20), (double)(compressedfilesize/filesize)*100);
     }
 
     /* Checksum */
@@ -418,7 +418,7 @@ unsigned long long FIO_compressFilename(const char* output_filename, const char*
     /* Status */
     DISPLAYLEVEL(2, "\r%79s\r", "");
     DISPLAYLEVEL(2,"Compressed %llu bytes into %llu bytes ==> %.2f%%\n",
-        (unsigned long long) filesize, (unsigned long long) compressedfilesize, (double)compressedfilesize/filesize*100);
+        (unsigned long long) filesize, (unsigned long long) compressedfilesize, (double)(compressedfilesize/filesize)*100);
 
     /* clean */
     free(in_buff);

diff --git a/programs/fullbench.c b/programs/fullbench.c
@@ -188,7 +188,7 @@ static int local_count8v2(void* dst, size_t dstSize, const void* src, size_t src
     memset(count, 0, sizeof(count));
 
     while (ptr != end) {
-        register U64 bs = next;
+        U64 bs = next;
         next = *ptr++;
 
         count[ 0][(BYTE)bs] ++;

diff --git a/programs/zlibh.c b/programs/zlibh.c
@@ -63,8 +63,10 @@ You can contact the author at :
 #endif
 
 #ifdef __GNUC__    // GCC
+#ifndef __cplusplus
 #  pragma GCC diagnostic ignored "-Wstrict-prototypes"
 #endif
+#endif
 
 /*
 * Maximums for allocations and loops.  It is not useful to change these --
@@ -532,7 +534,7 @@ static void feed_bltree(tree_desc * ltree_desc, tree_desc * bltree_desc)
 */
 static unsigned bi_reverse(unsigned code, int len)
 {
-    register unsigned res = 0;
+    unsigned res = 0;
     do {
         res |= code & 1;
         code >>= 1, res <<= 1;