emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb/sha: #undef macro names before #defining them.

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-07-05 20:34:38 +02:00
parent 6f58be0748
commit fe4ef36bcd
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libbb/sha1.c
View File

@ -53,6 +53,12 @@ static inline uint64_t hton64(uint64_t v)
#endif #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) static void FAST_FUNC sha1_process_block64(sha1_ctx_t *ctx)
{ {
unsigned t; unsigned t;
@ -162,6 +168,13 @@ static const uint64_t sha_K[80] = {
0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL 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) static void FAST_FUNC sha256_process_block64(sha256_ctx_t *ctx)
{ {
unsigned t; unsigned t;