diff options
Diffstat (limited to 'parallel/mpi-ch/patches/patch-ca')
-rw-r--r-- | parallel/mpi-ch/patches/patch-ca | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/parallel/mpi-ch/patches/patch-ca b/parallel/mpi-ch/patches/patch-ca index f7a1e89dd2c..24c2c3c7b0f 100644 --- a/parallel/mpi-ch/patches/patch-ca +++ b/parallel/mpi-ch/patches/patch-ca @@ -1,11 +1,10 @@ -$NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $ - ---- romio/adio/common/ad_fstype.c.orig 2002-12-04 00:38:23.000000000 +0100 -+++ romio/adio/common/ad_fstype.c -@@ -12,7 +12,15 @@ +$NetBSD: patch-ca,v 1.2 2005/03/03 12:01:30 garbled Exp $ +--- romio/adio/common/ad_fstype.c.orig 2003-09-04 13:24:44.000000000 -0700 ++++ romio/adio/common/ad_fstype.c 2004-10-15 09:54:55.000000000 -0700 +@@ -11,7 +11,15 @@ + */ #include "adio.h" - -#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY)) +#ifdef __NetBSD__ +#include <sys/param.h> @@ -19,12 +18,12 @@ $NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $ #include <sys/statvfs.h> #endif #ifdef LINUX -@@ -143,10 +151,10 @@ static void ADIO_FileSysType_fncall(char +@@ -159,10 +167,10 @@ char *dir; int err; #endif -#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY)) -+#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY) || defined(NETBSD_STATVFS)) ++#if (defined(HPUX) || defined(SPPUX) || defined(IRIX) || defined(SOLARIS) || defined(AIX) || defined(DEC) || defined(CRAY) || defined(NETBSD_STATVFS)) struct statvfs vfsbuf; #endif -#if (defined(LINUX) || defined(FREEBSD) || defined(tflops)) @@ -32,7 +31,7 @@ $NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $ struct statfs fsbuf; #endif #ifdef PARAGON -@@ -158,7 +166,7 @@ static void ADIO_FileSysType_fncall(char +@@ -174,7 +182,7 @@ *error_code = MPI_SUCCESS; @@ -41,8 +40,8 @@ $NetBSD: patch-ca,v 1.1 2004/06/24 17:32:14 drochner Exp $ do { err = statvfs(filename, &vfsbuf); } while (err && (errno == ESTALE)); -@@ -207,7 +215,7 @@ static void ADIO_FileSysType_fncall(char - # endif +@@ -226,7 +234,7 @@ + #endif else *fstype = ADIO_UFS; } -#elif (defined(FREEBSD) && defined(HAVE_MOUNT_NFS)) |