From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 4 Jan 2010 22:57:30 +0000 (-0500)
Subject: linux kernel lacks uintptr
X-Git-Tag: openafs-devel-1_5_69~40
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=165571947be770645900bb8d55ba7b6a3c58f8fd

linux kernel lacks uintptr

sadly only recent kernels include uintptr_t. change the cast to use unsigned
long

Change-Id: Ib69f7aa0f2d316c5ea8bdc960b15ee0f89f96250
Reviewed-on: http://gerrit.openafs.org/1059
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/acinclude.m4 b/acinclude.m4
index 8be2c7b..45e1c3f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1485,6 +1485,9 @@ fi
 AC_TYPE_SOCKLEN_T
 AC_TYPE_SIGNAL
 AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(unsigned long long)
+AC_CHECK_SIZEOF(unsigned long)
+AC_CHECK_SIZEOF(unsigned int)
 AC_TYPE_INTPTR_T
 AC_TYPE_UINTPTR_T
 AC_CHECK_TYPE(ssize_t, int)
diff --git a/src/afs/afs_syscall.c b/src/afs/afs_syscall.c
index c83e71e..cc7ca92 100644
--- a/src/afs/afs_syscall.c
+++ b/src/afs/afs_syscall.c
@@ -341,13 +341,22 @@ struct iparam32 {
 
 
 #if defined(AFS_HPUX_64BIT_ENV) || defined(AFS_SUN57_64BIT_ENV) || (defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)) || defined(NEED_IOCTL32)
+#if SIZEOF_VOID_P == SIZEOF_UNSIGNED_INT
+# define uintptrsz unsigned int
+#elif SIZEOF_VOID_P == SIZEOF_UNSIGNED_LONG
+# define uintptrsz unsigned long
+#elif SIZEOF_VOID_P == SIZEOF_UNSIGNED_LONG_LONG
+# define uintptrsz unsigned long long
+#else
+# error "Unable to determine casting for pointers"
+#endif
 static void
 iparam32_to_iparam(const struct iparam32 *src, struct iparam *dst)
 {
-    dst->param1 = (iparmtype)(uintptr_t)src->param1;
-    dst->param2 = (iparmtype)(uintptr_t)src->param2;
-    dst->param3 = (iparmtype)(uintptr_t)src->param3;
-    dst->param4 = (iparmtype)(uintptr_t)src->param4;
+    dst->param1 = (iparmtype)(uintptrsz)src->param1;
+    dst->param2 = (iparmtype)(uintptrsz)src->param2;
+    dst->param3 = (iparmtype)(uintptrsz)src->param3;
+    dst->param4 = (iparmtype)(uintptrsz)src->param4;
 }
 #endif