diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/c/aes.c | 8 | ||||
-rw-r--r-- | test/c/binarytrees.c | 1 | ||||
-rw-r--r-- | test/c/nsievebits.c | 17 | ||||
-rw-r--r-- | test/c/sha1.c | 8 |
4 files changed, 16 insertions, 18 deletions
diff --git a/test/c/aes.c b/test/c/aes.c index d1c1c20f..db4f5618 100644 --- a/test/c/aes.c +++ b/test/c/aes.c @@ -36,11 +36,11 @@ typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; -#if defined(__i386__) || defined(__x86_64__) -#undef ARCH_BIG_ENDIAN -#elif defined(__ppc__) +#if defined(__ppc__) #define ARCH_BIG_ENDIAN -#elif +#elif defined(__i386__) || defined(__x86_64__) +#undef ARCH_BIG_ENDIAN +#else #error "unknown endianness" #endif diff --git a/test/c/binarytrees.c b/test/c/binarytrees.c index 0c5bf375..da019af6 100644 --- a/test/c/binarytrees.c +++ b/test/c/binarytrees.c @@ -7,7 +7,6 @@ icc -O3 -ip -unroll -static binary-trees.c -lm */ -#include <malloc.h> #include <math.h> #include <stdio.h> #include <stdlib.h> diff --git a/test/c/nsievebits.c b/test/c/nsievebits.c index ad96011d..9ce6aaa0 100644 --- a/test/c/nsievebits.c +++ b/test/c/nsievebits.c @@ -13,10 +13,10 @@ typedef unsigned int bits; #define NBITS (8 * sizeof(bits)) -static unsigned long -nsieve(unsigned long m) +static unsigned int +nsieve(unsigned int m) { - unsigned long count, i, j; + unsigned int count, i, j; bits * a; a = malloc((m / NBITS) * sizeof(bits)); memset(a, (1 << 8) - 1, (m / NBITS) * sizeof(bits)); @@ -31,22 +31,21 @@ nsieve(unsigned long m) } static void -test(unsigned long n) +test(unsigned int n) { - unsigned long count, m; + unsigned int count, m; m = (1 << n) * 10000; count = nsieve(m); - printf("Primes up to %8ju %8ju\n", m, count); + printf("Primes up to %8u %8u\n", m, count); } int main(int ac, char **av) { - unsigned long n; - char *cp; + unsigned int n; - n = ac < 2 ? 9 : strtoul(av[1], &cp, 10); + n = ac < 2 ? 9 : atoi(av[1]); test(n); if (n >= 1) test(n - 1); diff --git a/test/c/sha1.c b/test/c/sha1.c index 87e16279..ca187bf2 100644 --- a/test/c/sha1.c +++ b/test/c/sha1.c @@ -5,11 +5,11 @@ #include <stdio.h> #include <stdlib.h> -#if defined(__i386__) || defined(__x86_64__) -#undef ARCH_BIG_ENDIAN -#elif defined(__ppc__) +#if defined(__ppc__) #define ARCH_BIG_ENDIAN -#elif +#elif defined(__i386__) || defined(__x86_64__) +#undef ARCH_BIG_ENDIAN +#else #error "unknown endianness" #endif |