From 77dd643f1d36ad6941ec599e29124cdea8cde6f0 Mon Sep 17 00:00:00 2001
From: Pete Wyckoff <pw@osc.edu>
Date: Mon, 28 Jan 2008 11:51:53 -0500
Subject: [PATCH] simplify kernel intptr; always long there

---
 include/pvfs2-types.h | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/include/pvfs2-types.h b/include/pvfs2-types.h
index a149d9c..949e833 100644
--- a/include/pvfs2-types.h
+++ b/include/pvfs2-types.h
@@ -66,22 +66,8 @@
 #ifdef __KERNEL__
 #define strdup(s) kstrdup(s, GFP_KERNEL)
 #define assert(x) BUG_ON(!(x))
-#if PVFS2_SIZEOF_VOIDP == 32
-#ifndef uintptr_t
-#define uintptr_t uint32_t
-#endif
 #ifndef intptr_t
-#define intptr_t int32_t
-#endif
-#elif PVFS2_SIZEOF_VOIDP == 64
-#ifndef uintptr_t
-#define uintptr_t uint64_t
-#endif
-#ifndef intptr_t
-#define intptr_t int64_t
-#endif
-#else
-#error "Unhandled uintptr size"
+#define intptr_t long
 #endif
 #endif