[PATCH] test/input: Replace negative architecture test by test for 64-bit

Geert Uytterhoeven geert at linux-m68k.org
Tue Feb 12 02:17:22 PST 2013


The test for double-aligned members in dix_valuator_alloc() currently
depends on "if !defined(__i386__) && !defined(__sh__)". This covers
m68k, where it fails.

According to the comment, the test should be limited to 64-bit
platforms only. Hence check if sizeof(long) == 8 instead.

Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
---
Untested for now

 test/input.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/input.c b/test/input.c
index be988a4..ed29bdc 100644
--- a/test/input.c
+++ b/test/input.c
@@ -1384,11 +1384,11 @@ dix_valuator_alloc(void)
 
         assert(v);
         assert(v->numAxes == num_axes);
-#if !defined(__i386__) && !defined(__sh__)
-        /* must be double-aligned on 64 bit */
-        assert(((void *) v->axisVal - (void *) v) % sizeof(double) == 0);
-        assert(((void *) v->axes - (void *) v) % sizeof(double) == 0);
-#endif
+        if (sizeof(long) == 8) {
+            /* must be double-aligned on 64 bit */
+            assert(((void *) v->axisVal - (void *) v) % sizeof(double) == 0);
+            assert(((void *) v->axes - (void *) v) % sizeof(double) == 0);
+        }
         num_axes++;
     }
 
-- 
1.7.0.4



More information about the xorg-devel mailing list