On Sunday 05 July 2009 20:29:53 Denys Vlasenko wrote:
> diff -d -urpN busybox.2/libbb/sha1.c busybox.3/libbb/sha1.c
> --- busybox.2/libbb/sha1.c 2009-07-05 13:23:15.000000000 +0200
> +++ busybox.3/libbb/sha1.c 2009-07-05 20:27:10.000000000 +0200
> @@ -53,6 +53,12 @@ static inline uint64_t hton64(uint64_t v
> #endif
>
>
> +/* Some arch headers have conflicting defines */
> +#undef ch
> +#undef parity
> +#undef maj
> +#undef rnd
> +
> static void FAST_FUNC sha1_process_block64(sha1_ctx_t *ctx)
> {
> unsigned t;
> @@ -162,6 +168,13 @@ static const uint64_t sha_K[80] = {
> 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
> };
>
> +#undef Ch
> +#undef Maj
> +#undef S0
> +#undef S1
> +#undef R0
> +#undef R1
> +
> static void FAST_FUNC sha256_process_block64(sha256_ctx_t *ctx)
> {
> unsigned t;
Hi,
works fine, thanks.
Ciao,
Tito
_______________________________________________
busybox mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox