From: Douglas Engert <deengert@anl.gov>
Date: Tue, 9 Nov 2004 17:18:48 +0000 (+0000)
Subject: STABLE14-vfsck-sol9-breadwrite-args-20041108
X-Git-Tag: openafs-devel-1_3_74~5
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=96d3312db95fa2b21183b5bab818a143356fbceb;p=packages%2Fo%2Fopenafs.git

STABLE14-vfsck-sol9-breadwrite-args-20041108

FIXES 15927

fix arg types for bread/bwrite for solaris 9


(cherry picked from commit 40c1d00508b3ad9e4384ad7cc3f39f7a206c4014)
---

diff --git a/src/vfsck/fsck.h b/src/vfsck/fsck.h
index b6427a388..52479c24a 100644
--- a/src/vfsck/fsck.h
+++ b/src/vfsck/fsck.h
@@ -325,3 +325,9 @@ daddr_t n_cont;			/* number of continuation inodes seen */
 #define fs_link         fs_unused[0]
 #define fs_rlink        fs_unused[1]
 #endif /* AFS_HPUX110_ENV */
+
+#ifdef AFS_SUN59_ENV
+/* diskaddr_t is longlong */
+int bread(int fd, char *buf, diskaddr_t blk, long size);
+int bwrite(int fd, char *buf,  diskaddr_t blk, long size);
+#endif
diff --git a/src/vfsck/utilities.c b/src/vfsck/utilities.c
index 9a77ceb47..b247f2ed3 100644
--- a/src/vfsck/utilities.c
+++ b/src/vfsck/utilities.c
@@ -388,7 +388,11 @@ ckfini()
 bread(fd, buf, blk, size)
      int fd;
      char *buf;
+#ifdef AFS_SUN59_ENV
+     diskaddr_t blk;
+#else
      daddr_t blk;
+#endif
      long size;
 {
     char *cp;
@@ -451,7 +455,11 @@ bread(fd, buf, blk, size)
 bwrite(fd, buf, blk, size)
      int fd;
      char *buf;
+#ifdef AFS_SUN59_ENV
+     diskaddr_t blk;
+#else
      daddr_t blk;
+#endif
      long size;
 {
     int i, n;