From 165233d16674fc82f3525065f49faccd7a35a992 Mon Sep 17 00:00:00 2001 From: Jeff Moyer Date: Tue, 14 Sep 2004 19:40:27 +0000 Subject: - Switch around the tests for _PPC_ and _powerpc64_ so that the ppc64 platforms get the right padding. --- libaio.spec | 8 ++++++-- src/libaio.h | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libaio.spec b/libaio.spec index d6d4dd9..99fb0d3 100644 --- a/libaio.spec +++ b/libaio.spec @@ -1,6 +1,6 @@ Name: libaio -Version: 0.3.99 -Release: 4 +Version: 0.3.100 +Release: 1 Summary: Linux-native asynchronous I/O access library Copyright: LGPL Group: System Environment/Libraries @@ -59,6 +59,10 @@ make install prefix=$RPM_BUILD_ROOT/usr \ %attr(0644,root,root) %{_libdir}/libaio.a %changelog +* Tue Sep 14 2004 Jeff Moyer - 0.3.100-1 +- Switch around the tests for _PPC_ and _powerpc64_ so that the ppc64 + platforms get the right padding. + * Wed Jul 14 2004 Jeff Moyer - 0.3.99-4 - Ok, there was a race in moving the cvs module. Someone rebuild from the old cvs into fc3. *sigh* bumping rev. diff --git a/src/libaio.h b/src/libaio.h index c78a1eb..e426f9b 100644 --- a/src/libaio.h +++ b/src/libaio.h @@ -56,14 +56,14 @@ typedef enum io_iocb_cmd { #define PADDED(x, y) x, y #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(__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 */ #define PADDED(x, y) unsigned y; x #define PADDEDptr(x,y) x -- cgit v1.2.1