From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 29 Sep 2009 09:25:46 +0000 (-0400)
Subject: irix compile fixes
X-Git-Tag: openafs-devel-1_5_65~12
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c4bffd7efbcf27f7a8c9c0f81c4b79d3251a5d3a;p=packages%2Fo%2Fopenafs.git

irix compile fixes

fix compilation for irix (and warning for solaris) for icreate
as well as more stdint.h fixes

Reviewed-on: http://gerrit.openafs.org/548
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/afs.h b/src/afs/afs.h
index 813bbac69..7039d51e4 100644
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -992,13 +992,19 @@ struct cm_initparams {
 
 #ifdef AFS_DARWIN100_ENV
 typedef user_addr_t iparmtype; /* 64 bit */
+typedef user_addr_t uparmtype; /* 64 bit */
 #else
-typedef char * iparmtype;
+typedef char * uparmtype;
+#ifdef AFS_SGI65_ENV
+typedef afs_uint32 iparmtype;
+#else
+typedef long iparmtype;
+#endif
 #endif
 
 struct afs_ioctl {
-    iparmtype in;		/* input buffer */
-    iparmtype out;		/* output buffer */
+    uparmtype in;		/* input buffer */
+    uparmtype out;		/* output buffer */
     short in_size;		/* Size of input buffer <= 2K */
     short out_size;		/* Maximum size of output buffer, <= 2K */
 };
diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index bd4a5f22a..3a7a9eba0 100644
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -142,7 +142,7 @@ int HandleIoctl(register struct vcache *avc, register afs_int32 acom,
 int afs_HandlePioctl(struct vnode *avp, afs_int32 acom,
 		     register struct afs_ioctl *ablob, int afollow,
 		     AFS_UCRED **acred);
-static int Prefetch(iparmtype apath, struct afs_ioctl *adata, int afollow,
+static int Prefetch(uparmtype apath, struct afs_ioctl *adata, int afollow,
 		    AFS_UCRED *acred);
 
 typedef int (*pioctlFunction) (struct vcache *, int, struct vrequest *,
@@ -2289,7 +2289,7 @@ DECL_PIOCTL(PCheckAuth)
 }
 
 static int
-Prefetch(iparmtype apath, struct afs_ioctl *adata, int afollow,
+Prefetch(uparmtype apath, struct afs_ioctl *adata, int afollow,
 	 AFS_UCRED *acred)
 {
     register char *tp;
diff --git a/src/gtx/frame.c b/src/gtx/frame.c
index 9a2f797a3..a1b3cdfc5 100644
--- a/src/gtx/frame.c
+++ b/src/gtx/frame.c
@@ -18,8 +18,9 @@
 
 #include <string.h>
 #include <stdlib.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
-
+#endif
 #include "gtxobjects.h"
 #include "gtxwindows.h"
 #include "gtxcurseswin.h"
diff --git a/src/gtx/gtxtest.c b/src/gtx/gtxtest.c
index 96c5a162f..780380ba9 100644
--- a/src/gtx/gtxtest.c
+++ b/src/gtx/gtxtest.c
@@ -12,8 +12,9 @@
 
 
 #include <string.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
-
+#endif
 #include "gtxwindows.h"
 #include "gtxobjects.h"
 #include "gtxtextobj.h"