[Parted-commits] GNU Parted Official Repository: Changes to 'stable-1.8.x'

[Otavio Salvador]

 include/parted/linux.h |    2 +-
 libparted/arch/linux.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 14225f4040bde29973434f37b885511c1f595451
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue May 6 14:09:37 2008 -0300

    properly test for __s390__ and __s390x__ macros to disable O_DIRECT on that
    (cherry picked from commit b299da486b051e5737942ea00446754ab41eef27)

diff --git a/include/parted/linux.h b/include/parted/linux.h
index 52d28be..05a2f0e 100644
--- a/include/parted/linux.h
+++ b/include/parted/linux.h
@@ -22,7 +22,7 @@
 #include <parted/parted.h>
 #include <parted/device.h>
 
-#if defined __s390__ || defined __s390x__
+#if defined(__s390__) || defined(__s390x__)
 #  include <parted/fdasd.h>
 #endif
 
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 462ab92..6e7d010 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -64,7 +64,7 @@
 #define HDIO_GETGEO             0x0301  /* get device geometry */
 #define HDIO_GET_IDENTITY       0x030d  /* get IDE identification info */
 
-#if defined(O_DIRECT) && (!defined(__s390__) || !defined(__s390x__))
+#if defined(O_DIRECT) && !(defined(__s390__) || defined(__s390x__))
 #define RD_MODE (O_RDONLY | O_DIRECT)
 #define WR_MODE (O_WRONLY | O_DIRECT)
 #define RW_MODE (O_RDWR | O_DIRECT)