diff options
Diffstat (limited to 'test/monniaux')
-rw-r--r-- | test/monniaux/idea/idea.c | 4 | ||||
-rw-r--r-- | test/monniaux/jpeg-6b/jconfig.h | 2 | ||||
-rw-r--r-- | test/monniaux/mbedtls/mbedtls_Kalray.patch | 2 | ||||
-rw-r--r-- | test/monniaux/ncompress/compress42.c | 2 | ||||
-rw-r--r-- | test/monniaux/picosat-965/picosat.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/test/monniaux/idea/idea.c b/test/monniaux/idea/idea.c index a428d7b1..884d256d 100644 --- a/test/monniaux/idea/idea.c +++ b/test/monniaux/idea/idea.c @@ -60,8 +60,8 @@ from */ #define TEST #define IDEA32 -#define INT_MOD(x,y) ((long)(x) % (y)) -#define INT_DIV(x,y) ((long)(x) / (y)) +#define INT_MOD(x,y) ((x) % (y)) +#define INT_DIV(x,y) ((x) / (y)) #include <string.h> #include <stdlib.h> diff --git a/test/monniaux/jpeg-6b/jconfig.h b/test/monniaux/jpeg-6b/jconfig.h index 90ee0d5f..c6b77e42 100644 --- a/test/monniaux/jpeg-6b/jconfig.h +++ b/test/monniaux/jpeg-6b/jconfig.h @@ -31,7 +31,7 @@ #undef NO_SWITCH #define HAS_FLOAT 1 -#ifdef __COMPCERT__ +#if 0 extern long long __compcert_i64_sdiv(long long a, long long b); extern long long __compcert_i64_smod(long long a, long long b); diff --git a/test/monniaux/mbedtls/mbedtls_Kalray.patch b/test/monniaux/mbedtls/mbedtls_Kalray.patch index 8b271130..25cd5922 100644 --- a/test/monniaux/mbedtls/mbedtls_Kalray.patch +++ b/test/monniaux/mbedtls/mbedtls_Kalray.patch @@ -47,7 +47,7 @@ index 87015af0c..a2bad7b84 100644 return( ret ); } -+#define INT_DIV(x,y) (((long)(x)) / (y)) ++#define INT_DIV(x,y) ((x) / (y)) + /* * Modulo: r = A mod b diff --git a/test/monniaux/ncompress/compress42.c b/test/monniaux/ncompress/compress42.c index 36bf0132..4a6c2f74 100644 --- a/test/monniaux/ncompress/compress42.c +++ b/test/monniaux/ncompress/compress42.c @@ -132,7 +132,7 @@ */ /* FIXME DMonniaux */ -#define INT_MOD(x, y) ((long) (x) % (y)) +#define INT_MOD(x, y) ((x) % (y)) #include "../clock.h" /* DMonniaux for utime and strdup */ diff --git a/test/monniaux/picosat-965/picosat.h b/test/monniaux/picosat-965/picosat.h index 2369b1a6..e735aec9 100644 --- a/test/monniaux/picosat-965/picosat.h +++ b/test/monniaux/picosat-965/picosat.h @@ -23,7 +23,7 @@ IN THE SOFTWARE. #ifndef picosat_h_INCLUDED #define picosat_h_INCLUDED -#define INT_MOD(x, y) ((long) (x) % (y)) +#define INT_MOD(x, y) ((x) % (y)) /*------------------------------------------------------------------------*/ |