diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2013-02-02 04:33:48 -0500 |
|---|---|---|
| committer | Jeff Moyer <jmoyer@redhat.com> | 2013-02-05 11:34:40 -0500 |
| commit | e327953964f8f88cc8911748a420ff39945da9ec (patch) | |
| tree | c177218749a0d7bd4345fec7edb118b939a02fee | |
| parent | edbd86368f82615fa26894dcdc2cf4e4435104cb (diff) | |
| download | libaio-e327953964f8f88cc8911748a420ff39945da9ec.tar.gz | |
unify LE/BE 32/64bit logic
No point in duplicating the bodies of the #if statements when we can
just merge the #if checks together.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
| -rw-r--r-- | src/libaio.h | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/src/libaio.h b/src/libaio.h index c03ff9c..b44c02d 100644 --- a/src/libaio.h +++ b/src/libaio.h @@ -49,58 +49,35 @@ typedef enum io_iocb_cmd { IO_CMD_PWRITEV = 8, } io_iocb_cmd_t; -#if defined(__i386__) /* little endian, 32 bits */ +/* little endian, 32 bits */ +#if defined(__i386__) || (defined(__arm__) && !defined(__ARMEB__)) #define PADDED(x, y) x; unsigned y #define PADDEDptr(x, y) x; unsigned y #define PADDEDul(x, y) unsigned long x; unsigned y -#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) + +/* little endian, 64 bits */ +#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || \ + (defined(__aarch64__) && defined(__AARCH64EL__)) #define PADDED(x, y) x, y #define PADDEDptr(x, y) x #define PADDEDul(x, y) unsigned long x -#elif defined(__powerpc64__) /* big endian, 64 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x,y) x -#define PADDEDul(x, y) unsigned long x -#elif defined(__PPC__) /* big endian, 32 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x, y) unsigned y; x -#define PADDEDul(x, y) unsigned y; unsigned long x -#elif defined(__s390x__) /* big endian, 64 bits */ + +/* big endian, 64 bits */ +#elif defined(__powerpc64__) || defined(__s390x__) || \ + (defined(__sparc__) && defined(__arch64__)) || \ + (defined(__aarch64__) && defined(__AARCH64EB__)) #define PADDED(x, y) unsigned y; x #define PADDEDptr(x,y) x #define PADDEDul(x, y) unsigned long x -#elif defined(__s390__) /* big endian, 32 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x, y) unsigned y; x -#define PADDEDul(x, y) unsigned y; unsigned long x -#elif defined(__arm__) -# if defined (__ARMEB__) /* big endian, 32 bits */ + +/* big endian, 32 bits */ +#elif defined(__PPC__) || defined(__s390__) || \ + (defined(__arm__) && defined(__ARMEB__)) || \ + defined(__sparc__) #define PADDED(x, y) unsigned y; x #define PADDEDptr(x, y) unsigned y; x #define PADDEDul(x, y) unsigned y; unsigned long x -# else /* little endian, 32 bits */ -#define PADDED(x, y) x; unsigned y -#define PADDEDptr(x, y) x; unsigned y -#define PADDEDul(x, y) unsigned long x; unsigned y -# endif -#elif defined(__sparc__) && defined(__arch64__) /* big endian, 64 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x,y) x -#define PADDEDul(x, y) unsigned long x -#elif defined(__sparc__) /* big endian, 32 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x, y) unsigned y; x -#define PADDEDul(x, y) unsigned y; unsigned long x -#elif defined(__aarch64__) -# if defined (__AARCH64EB__) /* big endian, 64 bits */ -#define PADDED(x, y) unsigned y; x -#define PADDEDptr(x,y) x -#define PADDEDul(x, y) unsigned long x -# elif defined(__AARCH64EL__) /* little endian, 64 bits */ -#define PADDED(x, y) x, y -#define PADDEDptr(x, y) x -#define PADDEDul(x, y) unsigned long x -# endif + #else #error endian? #endif |