diff --git a/programs/bench.c b/programs/bench.c index 384b982f4..63b98e532 100644 --- 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 9cc5264d2..112259ddc 100644 --- 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 0ea1ad152..c9b6b04e1 100644 --- 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 41155694e..37098f2f7 100644 --- 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 7d7b64664..407653119 100644 --- 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 980c36176..46671a15c 100644 --- 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 e258932da..ae14aa074 100644 --- 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 f770c8395..9b6f7bad6 100644 --- 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 aad9cba71..207b2e015 100644 --- 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;