1 From: Bastian Blank <waldi@debian.org>
2 Date: Tue, 24 Jun 2008 16:38:37 +0200
3 Subject: [PATCH] get rid of arch specific ifdef spaghettis
6 kpartx/lopart.c | 19 ++-----------------
7 1 files changed, 2 insertions(+), 17 deletions(-)
9 diff --git a/kpartx/lopart.c b/kpartx/lopart.c
10 index b18d6fa..6d02a18 100644
16 #include <sysmacros.h>
18 -#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \
19 - || defined (__x86_64__)
20 -typedef unsigned long __kernel_old_dev_t;
21 -#elif defined(__powerpc__) || defined(__ia64__)
22 -typedef unsigned int __kernel_old_dev_t;
24 -typedef unsigned short __kernel_old_dev_t;
27 -#define dev_t __kernel_old_dev_t
30 #include <linux/loop.h>
35 -#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) \
36 - && !defined (__s390x__)
37 -#define int2ptr(x) ((void *) ((int) x))
39 -#define int2ptr(x) ((void *) ((long) x))
41 +#define int2ptr(x) ((void *) ((uintptr_t) x))
44 xstrdup (const char *s)