From 2c39eee805e4bc875eab737e529feb0c4c91f50e Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 5 May 2006 16:54:40 +0000 Subject: [PATCH] Migrate endianness macros. --- libbb/sha1.c | 2 +- util-linux/fdisk.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libbb/sha1.c b/libbb/sha1.c index 4b28266af..dd4009834 100644 --- a/libbb/sha1.c +++ b/libbb/sha1.c @@ -153,7 +153,7 @@ void *sha1_end(void *resbuf, sha1_ctx_t *ctx) #else static uint32_t mask[4] = { 0x00000000, 0x000000ff, 0x0000ffff, 0x00ffffff }; static uint32_t bits[4] = { 0x00000080, 0x00008000, 0x00800000, 0x80000000 }; -#endif /* __BYTE_ORDER */ +#endif uint8_t *hval = resbuf; uint32_t i, cnt = (uint32_t) (ctx->count[0] & SHA1_MASK); diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 9701c467b..2042951d9 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -2343,7 +2343,7 @@ create_sgilabel(void) "until you decide to write them. After that, of course, the previous\n" "content will be unrecoverably lost.\n\n")); - sgi_other_endian = (BYTE_ORDER == LITTLE_ENDIAN); + sgi_other_endian = (BB_LITTLE_ENDIAN); res = ioctl(fd, BLKGETSIZE, &longsectors); if (!ioctl(fd, HDIO_GETGEO, &geometry)) { heads = geometry.heads; @@ -2681,11 +2681,7 @@ create_sunlabel(void) _("Building a new sun disklabel. Changes will remain in memory only,\n" "until you decide to write them. After that, of course, the previous\n" "content won't be recoverable.\n\n")); -#if BYTE_ORDER == LITTLE_ENDIAN - sun_other_endian = 1; -#else - sun_other_endian = 0; -#endif + sun_other_endian = BB_LITTLE_ENDIAN; memset(MBRbuffer, 0, sizeof(MBRbuffer)); sunlabel->magic = SUN_SSWAP16(SUN_LABEL_MAGIC); if (!floppy) {