Combine definitions of SEC_TO_MICRO

diff --git a/programs/bench.c b/programs/bench.c
index 384b982f400a82987c53549b8fb19fa3d843c4c9..63b98e5322087f1aae21162f97fe37608685b3da 100644 (file)
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -71,7 +71,6 @@ static U32 g_compressibilityDefault = 50;
 #define DISPLAYLEVEL(l, ...) if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); }
 static int g_displayLevel = 2;   /* 0 : no display;   1: errors;   2 : + result + interaction + warnings;   3 : + progression;   4 : + information */
 
-#define SEC_TO_MICRO 1000000
 static const U64 g_refreshRate = SEC_TO_MICRO / 6;
 static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER;
 

diff --git a/programs/dibio.c b/programs/dibio.c
index 9cc5264d27ac56b9a86cdd73d10dd192139c6867..112259ddcd054364df7172e7413808d9974c8979 100644 (file)
--- a/programs/dibio.c
+++ b/programs/dibio.c
@@ -54,7 +54,6 @@ static const size_t g_maxMemory = (sizeof(size_t) == 4) ? (2 GB - 64 MB) : ((siz
 #define DISPLAY(...)         fprintf(stderr, __VA_ARGS__)
 #define DISPLAYLEVEL(l, ...) if (displayLevel>=l) { DISPLAY(__VA_ARGS__); }
 
-#define SEC_TO_MICRO 1000000
 static const U64 g_refreshRate = SEC_TO_MICRO / 6;
 static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER;
 

diff --git a/programs/fileio.c b/programs/fileio.c
index 0ea1ad1521d59cd867303ec62261d17d0794c667..c9b6b04e1a14e63c8efe1da0742b47117efd0956 100644 (file)
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -81,7 +81,6 @@
 static int g_displayLevel = 2;   /* 0 : no display;  1: errors;  2: + result + interaction + warnings;  3: + progression;  4: + information */
 void FIO_setNotificationLevel(unsigned level) { g_displayLevel=level; }
 
-#define SEC_TO_MICRO 1000000
 static const U64 g_refreshRate = SEC_TO_MICRO / 6;
 static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER;
 

diff --git a/programs/util.h b/programs/util.h
index 41155694edd526cd0289bf27f1d91e0816eb712f..37098f2f7256d455982940faf4ead17a297914cb 100644 (file)
--- a/programs/util.h
+++ b/programs/util.h
@@ -216,6 +216,7 @@ static int g_utilDisplayLevel;
     UTIL_STATIC U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd) { return 1000000000ULL * (clockEnd - clockStart) / CLOCKS_PER_SEC; }
 #endif
 
+#define SEC_TO_MICRO 1000000
 
 /* returns time span in microseconds */
 UTIL_STATIC U64 UTIL_clockSpanMicro( UTIL_time_t clockStart )

diff --git a/tests/decodecorpus.c b/tests/decodecorpus.c
index 7d7b64664f87de61543c60c9173a67d579442285..407653119dd25558a9d5eda79898f5303128da17 100644 (file)
--- a/tests/decodecorpus.c
+++ b/tests/decodecorpus.c
@@ -57,7 +57,6 @@ static U32 g_displayLevel = 2;
         }                                                                      \
     } while (0)
 
-#define SEC_TO_MICRO 1000000
 static const U64 g_refreshRate = SEC_TO_MICRO / 6;
 static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER;
 

diff --git a/tests/fuzzer.c b/tests/fuzzer.c
index 980c361768f864dd2d61eab748d23f8dc244a2f9..46671a15cd40b276cd6f99b4f94fe36424b42df4 100644 (file)
--- a/tests/fuzzer.c
+++ b/tests/fuzzer.c
@@ -56,7 +56,6 @@ static const U32 nbTestsDefault = 30000;
 #define DISPLAYLEVEL(l, ...)  if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); }
 static U32 g_displayLevel = 2;
 
-#define SEC_TO_MICRO 1000000
 static const U64 g_refreshRate = SEC_TO_MICRO / 6;
 static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER;
 

diff --git a/tests/paramgrill.c b/tests/paramgrill.c
index e258932dabbf2736f96f9177d66ae4ba3de1f7da..ae14aa0748194159bcb7e9fe527e9a6c6323e46d 100644 (file)
--- a/tests/paramgrill.c
+++ b/tests/paramgrill.c
@@ -39,7 +39,6 @@
 #define MB *(1<<20)
 #define GB *(1ULL<<30)
 
-#define SEC_TO_MICRO 1000000
 #define NBLOOPS    2
 #define TIMELOOP  (2 * SEC_TO_MICRO)
 

diff --git a/tests/zbufftest.c b/tests/zbufftest.c
index f770c8395d29d33f21bcf0e320fe839436797eec..9b6f7bad6dc60edac05feb1884adc04bc1315a01 100644 (file)
--- a/tests/zbufftest.c
+++ b/tests/zbufftest.c
@@ -58,7 +58,6 @@ static const U32 prime2 = 2246822519U;
 #define DISPLAYLEVEL(l, ...)  if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); }
 static U32 g_displayLevel = 2;
 
-#define SEC_TO_MICRO 1000000
 static const U64 g_refreshRate = SEC_TO_MICRO / 6;
 static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER;
 

diff --git a/tests/zstreamtest.c b/tests/zstreamtest.c
index aad9cba71deabf92491c7f91b1000571363f74a0..207b2e015754f605587c9a2937d8d6ba3b78d443 100644 (file)
--- a/tests/zstreamtest.c
+++ b/tests/zstreamtest.c
@@ -62,7 +62,6 @@ static const U32 prime32 = 2654435761U;
                                   if (g_displayLevel>=4) fflush(stderr); }
 static U32 g_displayLevel = 2;
 
-#define SEC_TO_MICRO 1000000
 static const U64 g_refreshRate = SEC_TO_MICRO / 6;
 static UTIL_time_t g_displayClock = UTIL_TIME_INITIALIZER;