rpms
/
hdf
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update patches

Browse Source
epel9
Orion Poplawski 15 years ago
parent 4030299c39
commit 7692aebfe8
5 changed files with 352 additions and 345 deletions
Show Stats Download Patch File Download Diff File

476
hdf-4.2r3-ppc.patch → hdf-4.2.4-ppc.patch
Unescape View File

@ -1,6 +1,6 @@
diff -up HDF4.2r2/hdf/src/hdfi.h.ppc HDF4.2r2/hdf/src/hdfi.h diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.ppc hdf-4.2.4-snap8/hdf/src/hdfi.h
--- HDF4.2r2/hdf/src/hdfi.h.ppc 2007-09-17 17:45:17.000000000 +0200 --- hdf-4.2.4-snap8/hdf/src/hdfi.h.ppc 2010-01-17 21:24:56.000000000 -0700
+++ HDF4.2r2/hdf/src/hdfi.h 2007-10-17 23:04:40.000000000 +0200 +++ hdf-4.2.4-snap8/hdf/src/hdfi.h 2010-02-01 13:21:54.874623840 -0700
@@ -76,6 +76,7 @@ @@ -76,6 +76,7 @@
#define DFMT_IA64 0x4441 #define DFMT_IA64 0x4441
#define DFMT_LINUX64 0x4441 #define DFMT_LINUX64 0x4441
@ -9,7 +9,7 @@ diff -up HDF4.2r2/hdf/src/hdfi.h.ppc HDF4.2r2/hdf/src/hdfi.h
/* I/O library constants */ /* I/O library constants */
#define UNIXUNBUFIO 1 #define UNIXUNBUFIO 1
@@ -1392,6 +1393,57 @@ typedef long hdf_pint_t; @@ -1340,6 +1341,57 @@ typedef long hdf_pint_t;
#endif /*Linux 64 */ #endif /*Linux 64 */
@ -64,38 +64,12 @@ diff -up HDF4.2r2/hdf/src/hdfi.h.ppc HDF4.2r2/hdf/src/hdfi.h
+ +
+#endif /*Linux PPC */ +#endif /*Linux PPC */
+ +
/*#ifndef GOT_MACHINE /*-----------------------------------------------------*/
No machine type has been defined. Your Makefile needs to have someing like /* 64-bit Free BSD */
-DSUN or -DUNICOS in order for the HDF internal structures to be defined
diff -up HDF4.2r2/mfhdf/libsrc/array.c.ppc HDF4.2r2/mfhdf/libsrc/array.c diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-aix.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-aix.c
diff -up HDF4.2r2/mfhdf/libsrc/putget.c.ppc HDF4.2r2/mfhdf/libsrc/putget.c --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-aix.c.ppc 2010-01-17 21:24:52.000000000 -0700
diff -up HDF4.2r2/mfhdf/libsrc/netcdf.h.in.ppc HDF4.2r2/mfhdf/libsrc/netcdf.h.in +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-aix.c 2010-02-01 13:19:15.313387720 -0700
--- HDF4.2r2/mfhdf/libsrc/netcdf.h.in.ppc 2007-09-06 23:48:49.000000000 +0200
+++ HDF4.2r2/mfhdf/libsrc/netcdf.h.in 2007-10-17 22:48:25.000000000 +0200
@@ -295,7 +295,7 @@ typedef double ncdouble;
*/
#if defined _CRAYMPP
typedef short nclong;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__
typedef int nclong;
#else
typedef long nclong; /* default, compatible type */
diff -up HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h.ppc HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h
--- HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h.ppc 2004-11-22 19:57:50.000000000 +0100
+++ HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h 2007-10-17 22:48:25.000000000 +0200
@@ -304,7 +304,7 @@ typedef double ncdouble;
*/
#if defined _CRAYMPP
typedef short nclong;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
typedef int nclong;
#else
typedef long nclong; /* default, compatible type */
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-irix6.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-irix6.c
--- HDF4.2r2/mfhdf/fortran/config/jackets-irix6.c.ppc 2006-11-01 17:53:11.000000000 +0100
+++ HDF4.2r2/mfhdf/fortran/config/jackets-irix6.c 2007-10-17 22:48:25.000000000 +0200
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
@ -177,46 +151,46 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-irix6.c.ppc HDF4.2r2/mfhdf/fortra
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1615,7 +1615,7 @@ nncvgtg(cdfid, varid, start, count, stri @@ -1616,7 +1616,7 @@ nncvgtg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else @@ -1688,7 +1688,7 @@ nncvgtg(cdfid, varid, start, count, stri
@@ -1686,7 +1686,7 @@ nncvgtg(cdfid, varid, start, count, stri
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ @@ -1855,7 +1855,7 @@ nncapt(cdfid, varid, attname, datatype,
@@ -1852,7 +1852,7 @@ nncapt(cdfid, varid, attname, datatype,
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, attlen, 1); @@ -2021,7 +2021,7 @@ nncagt(cdfid, varid, attname, value, rco
@@ -2017,7 +2017,7 @@ nncagt(cdfid, varid, attname, value, rco
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
/* EIP We need int buffer to read data in on the platfroms where long is 8 bytes diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-alpha.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-alpha.c
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-alpha.c.ppc 2010-01-17 21:24:52.000000000 -0700
--- HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc 2005-02-09 04:04:19.000000000 +0100 +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-alpha.c 2010-02-01 13:19:15.323387579 -0700
+++ HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c 2007-10-17 22:48:25.000000000 +0200 @@ -34,7 +34,7 @@
@@ -39,7 +39,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
double dd; double dd;
@ -225,7 +199,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
int ll; int ll;
#else #else
long ll; long ll;
@@ -70,7 +70,7 @@ struct ncfils { /* This will be a comm @@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
double dd; double dd;
@ -234,7 +208,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
int ll; int ll;
#else #else
long ll; long ll;
@@ -435,7 +435,7 @@ stoig(shorts, ints, dims, basis, ndims) @@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims)
} }
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -243,7 +217,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
/* /*
* Convert multi-dimensional array of NCLONGs stored in ints to packed * Convert multi-dimensional array of NCLONGs stored in ints to packed
* array of longs, in malloc'ed space. Returns pointer to longs or NULL * array of longs, in malloc'ed space. Returns pointer to longs or NULL
@@ -931,7 +931,7 @@ NCVPT1(cdfid, varid, indices, value, rco @@ -917,7 +917,7 @@ nncvpt1(cdfid, varid, indices, value, rc
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -252,7 +226,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long longs = *(int *)value; long longs = *(int *)value;
@@ -1046,7 +1046,7 @@ NCVPT(cdfid, varid, start, count, value, @@ -1031,7 +1031,7 @@ nncvpt(cdfid, varid, start, count, value
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -261,7 +235,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, ncount, ndims); long *longs = itol (value, ncount, ndims);
@@ -1158,7 +1158,7 @@ NCVPTG(cdfid, varid, start, count, strid @@ -1142,7 +1142,7 @@ nncvptg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -270,7 +244,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1215,7 +1215,7 @@ NCVPTG(cdfid, varid, start, count, strid @@ -1199,7 +1199,7 @@ nncvptg(cdfid, varid, start, count, stri
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -279,7 +253,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itolg (value, ncount, nbasis, ndims); long *longs = itolg (value, ncount, nbasis, ndims);
@@ -1352,7 +1352,7 @@ NCVGT1(cdfid, varid, indices, value, rco @@ -1335,7 +1335,7 @@ nncvgt1(cdfid, varid, indices, value, rc
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -288,7 +262,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long longs; long longs;
@@ -1495,7 +1495,7 @@ NCVGT(cdfid, varid, start, count, value, @@ -1477,7 +1477,7 @@ nncvgt(cdfid, varid, start, count, value
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -297,7 +271,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1629,7 +1629,7 @@ NCVGTG(cdfid, varid, start, count, strid @@ -1618,7 +1618,7 @@ nncvgtg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -306,7 +280,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1700,7 +1700,7 @@ NCVGTG(cdfid, varid, start, count, strid @@ -1689,7 +1689,7 @@ nncvgtg(cdfid, varid, start, count, stri
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -315,7 +289,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1869,7 +1869,7 @@ NCAPT(cdfid, varid, attnamed, datatype, @@ -1855,7 +1855,7 @@ nncapt(cdfid, varid, attname, datatype,
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -324,7 +298,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
#ifdef HDF #ifdef HDF
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, attlen, 1); long *longs = itol (value, attlen, 1);
@@ -2038,7 +2038,7 @@ NCAGT(cdfid, varid, attnamed, value, rco @@ -2020,7 +2020,7 @@ nncagt(cdfid, varid, attname, value, rco
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -332,92 +306,86 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc HDF4.2r2/mfhdf/fortran/
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = (long *) malloc (attlen * sizeof (long));
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-unicos.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-unicos.c diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-apple.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-apple.c
--- HDF4.2r2/mfhdf/fortran/config/jackets-unicos.c.ppc 2005-02-09 04:04:19.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-apple.c.ppc 2010-01-17 21:24:52.000000000 -0700
+++ HDF4.2r2/mfhdf/fortran/config/jackets-unicos.c 2007-10-17 22:48:25.000000000 +0200 +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-apple.c 2010-02-01 13:19:15.318388441 -0700
@@ -39,7 +39,7 @@ @@ -34,7 +34,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
double dd; double dd;
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
int ll; int ll;
#else #else
long ll; @@ -66,7 +66,7 @@ struct ncfils { /* This will be a comm
@@ -70,7 +70,7 @@ struct ncfils { /* This will be a comm
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
double dd; double dd;
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
int ll; int ll;
#else #else
long ll; @@ -431,7 +431,7 @@ stoig(shorts, ints, dims, basis, ndims)
@@ -436,7 +436,7 @@ stoig(shorts, ints, dims, basis, ndims)
} }
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
/* /*
* Convert multi-dimensional array of NCLONGs stored in ints to packed * Convert multi-dimensional array of NCLONGs stored in ints to packed
* array of longs, in malloc'ed space. Returns pointer to longs or NULL @@ -1085,7 +1085,7 @@ nncvptg(cdfid, varid, start, count, stri
@@ -932,7 +932,7 @@ NCVPT1(cdfid, varid, indices, value, rco tmpbasis = nctypelen(NC_LONG);
return; else
} /* else */ #endif
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long longs = *(int *)value;
@@ -1047,7 +1047,7 @@ NCVPT(cdfid, varid, start, count, value,
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if (datatype == NC_LONG)
long *longs = itol (value, ncount, ndims); tmpbasis = sizeof(int);
@@ -1159,7 +1159,7 @@ NCVPTG(cdfid, varid, start, count, strid @@ -1440,7 +1440,7 @@ nncvgtg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-fbsd.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-fbsd.c
@@ -1216,7 +1216,7 @@ NCVPTG(cdfid, varid, start, count, strid --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-fbsd.c.ppc 2010-01-17 21:24:52.000000000 -0700
return; +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-fbsd.c 2010-02-01 13:19:15.325388057 -0700
} /* else */ @@ -34,7 +34,7 @@
#endif /* FORTRAN_HAS_NO_SHORT */
struct ncfils { /* This will be a common block from Fortran */
double dd;
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF int ll;
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { #else
long *longs = itolg (value, ncount, nbasis, ndims); long ll;
@@ -1353,7 +1353,7 @@ NCVGT1(cdfid, varid, indices, value, rco @@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm
return;
} /* else */ struct ncfils { /* This will be a common block from Fortran */
#endif /* FORTRAN_HAS_NO_SHORT */ double dd;
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF int ll;
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { #else
long longs; long ll;
@@ -1496,7 +1496,7 @@ NCVGT(cdfid, varid, start, count, value, @@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims)
return; }
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF /*
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { * Convert multi-dimensional array of NCLONGs stored in ints to packed
long iocount = dimprod (ncount, ndims); /* product of dimensions */ * array of longs, in malloc'ed space. Returns pointer to longs or NULL
@@ -1630,7 +1630,7 @@ NCVGTG(cdfid, varid, start, count, strid @@ -1083,7 +1083,7 @@ nncvptg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -426,36 +394,18 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-unicos.c.ppc HDF4.2r2/mfhdf/fortr
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1701,7 +1701,7 @@ NCVGTG(cdfid, varid, start, count, strid @@ -1437,7 +1437,7 @@ nncvgtg(cdfid, varid, start, count, stri
return; tmpbasis = nctypelen(NC_LONG);
} /* else */ else
#endif /* FORTRAN_HAS_NO_SHORT */ #endif
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1870,7 +1870,7 @@ NCAPT(cdfid, varid, attnamed, datatype,
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, attlen, 1);
@@ -2039,7 +2039,7 @@ NCAGT(cdfid, varid, attnamed, value, rco
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF if (datatype == NC_LONG)
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { tmpbasis = sizeof(int);
long *longs = (long *) malloc (attlen * sizeof (long)); else
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-aix.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-aix.c diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-hpux.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-hpux.c
--- HDF4.2r2/mfhdf/fortran/config/jackets-aix.c.ppc 2006-11-01 17:53:11.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-hpux.c.ppc 2010-01-17 21:24:52.000000000 -0700
+++ HDF4.2r2/mfhdf/fortran/config/jackets-aix.c 2007-10-17 22:48:25.000000000 +0200 +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-hpux.c 2010-02-01 13:19:15.321389852 -0700
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
@ -543,39 +493,39 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-aix.c.ppc HDF4.2r2/mfhdf/fortran/
#endif #endif
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
@@ -1688,7 +1688,7 @@ nncvgtg(cdfid, varid, start, count, stri else
@@ -1687,7 +1687,7 @@ nncvgtg(cdfid, varid, start, count, stri
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
@@ -1855,7 +1855,7 @@ nncapt(cdfid, varid, attname, datatype, long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1853,7 +1853,7 @@ nncapt(cdfid, varid, attname, datatype,
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
@@ -2021,7 +2021,7 @@ nncagt(cdfid, varid, attname, value, rco long *longs = itol (value, attlen, 1);
@@ -2018,7 +2018,7 @@ nncagt(cdfid, varid, attname, value, rco
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c /*EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
--- HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c.ppc 2006-11-01 17:53:11.000000000 +0100 diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-irix6.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-irix6.c
+++ HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c 2007-10-17 22:48:25.000000000 +0200 --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-irix6.c.ppc 2010-01-17 21:24:52.000000000 -0700
+++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-irix6.c 2010-02-01 13:19:15.308388923 -0700
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
@ -657,7 +607,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c.ppc HDF4.2r2/mfhdf/fort
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1617,7 +1617,7 @@ nncvgtg(cdfid, varid, start, count, stri @@ -1615,7 +1615,7 @@ nncvgtg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -666,7 +616,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c.ppc HDF4.2r2/mfhdf/fort
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1688,7 +1688,7 @@ nncvgtg(cdfid, varid, start, count, stri @@ -1686,7 +1686,7 @@ nncvgtg(cdfid, varid, start, count, stri
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -675,7 +625,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c.ppc HDF4.2r2/mfhdf/fort
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1854,7 +1854,7 @@ nncapt(cdfid, varid, attname, datatype, @@ -1852,7 +1852,7 @@ nncapt(cdfid, varid, attname, datatype,
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -684,7 +634,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c.ppc HDF4.2r2/mfhdf/fort
#ifdef HDF #ifdef HDF
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, attlen, 1); long *longs = itol (value, attlen, 1);
@@ -2019,7 +2019,7 @@ nncagt(cdfid, varid, attname, value, rco @@ -2017,7 +2017,7 @@ nncagt(cdfid, varid, attname, value, rco
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -692,10 +642,10 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c.ppc HDF4.2r2/mfhdf/fort
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
/* EIP /* EIP We need int buffer to read data in on the platfroms where long is 8 bytes
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-linux.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-linux.c diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c
--- HDF4.2r2/mfhdf/fortran/config/jackets-linux.c.ppc 2006-11-01 17:53:11.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.ppc 2010-01-17 21:24:52.000000000 -0700
+++ HDF4.2r2/mfhdf/fortran/config/jackets-linux.c 2007-10-17 22:48:25.000000000 +0200 +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c 2010-02-01 13:19:15.316388314 -0700
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
@ -813,57 +763,9 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-linux.c.ppc HDF4.2r2/mfhdf/fortra
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
/* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-apple.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-apple.c diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-solaris.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-solaris.c
--- HDF4.2r2/mfhdf/fortran/config/jackets-apple.c.ppc 2006-11-01 17:53:11.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-solaris.c.ppc 2010-01-17 21:24:52.000000000 -0700
+++ HDF4.2r2/mfhdf/fortran/config/jackets-apple.c 2007-10-17 22:48:25.000000000 +0200 +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-solaris.c 2010-02-01 13:19:15.315388002 -0700
@@ -34,7 +34,7 @@
struct ncfils { /* This will be a common block from Fortran */
double dd;
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
int ll;
#else
@@ -66,7 +66,7 @@ struct ncfils { /* This will be a comm
struct ncfils { /* This will be a common block from Fortran */
double dd;
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
int ll;
#else
@@ -431,7 +431,7 @@ stoig(shorts, ints, dims, basis, ndims)
}
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
/*
* Convert multi-dimensional array of NCLONGs stored in ints to packed
@@ -1085,7 +1085,7 @@ nncvptg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG);
else
#endif
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
if (datatype == NC_LONG)
tmpbasis = sizeof(int);
@@ -1440,7 +1440,7 @@ nncvgtg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG);
else
#endif
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
if (datatype == NC_LONG)
tmpbasis = sizeof(int);
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-hpux.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-hpux.c
--- HDF4.2r2/mfhdf/fortran/config/jackets-hpux.c.ppc 2006-11-01 17:53:11.000000000 +0100
+++ HDF4.2r2/mfhdf/fortran/config/jackets-hpux.c 2007-10-17 22:48:25.000000000 +0200
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
@ -945,7 +847,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-hpux.c.ppc HDF4.2r2/mfhdf/fortran
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1616,7 +1616,7 @@ nncvgtg(cdfid, varid, start, count, stri @@ -1617,7 +1617,7 @@ nncvgtg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -954,7 +856,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-hpux.c.ppc HDF4.2r2/mfhdf/fortran
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1687,7 +1687,7 @@ nncvgtg(cdfid, varid, start, count, stri @@ -1688,7 +1688,7 @@ nncvgtg(cdfid, varid, start, count, stri
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -963,7 +865,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-hpux.c.ppc HDF4.2r2/mfhdf/fortran
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1853,7 +1853,7 @@ nncapt(cdfid, varid, attname, datatype, @@ -1854,7 +1854,7 @@ nncapt(cdfid, varid, attname, datatype,
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -972,7 +874,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-hpux.c.ppc HDF4.2r2/mfhdf/fortran
#ifdef HDF #ifdef HDF
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, attlen, 1); long *longs = itol (value, attlen, 1);
@@ -2018,7 +2018,7 @@ nncagt(cdfid, varid, attname, value, rco @@ -2019,7 +2019,7 @@ nncagt(cdfid, varid, attname, value, rco
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -980,11 +882,11 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-hpux.c.ppc HDF4.2r2/mfhdf/fortran
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
/*EIP We need to use int buffer to read data in on the platforms where long is 8 bytes /* EIP
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-t3e.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-t3e.c
--- HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc 2006-11-01 17:53:11.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-t3e.c.ppc 2010-01-17 21:24:52.000000000 -0700
+++ HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c 2007-10-17 22:48:25.000000000 +0200 +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-t3e.c 2010-02-01 13:19:15.310387183 -0700
@@ -34,7 +34,7 @@ @@ -39,7 +39,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
double dd; double dd;
@ -993,7 +895,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
int ll; int ll;
#else #else
long ll; long ll;
@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm @@ -70,7 +70,7 @@ struct ncfils { /* This will be a comm
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
double dd; double dd;
@ -1002,7 +904,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
int ll; int ll;
#else #else
long ll; long ll;
@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims) @@ -435,7 +435,7 @@ stoig(shorts, ints, dims, basis, ndims)
} }
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1011,7 +913,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
/* /*
* Convert multi-dimensional array of NCLONGs stored in ints to packed * Convert multi-dimensional array of NCLONGs stored in ints to packed
* array of longs, in malloc'ed space. Returns pointer to longs or NULL * array of longs, in malloc'ed space. Returns pointer to longs or NULL
@@ -917,7 +917,7 @@ nncvpt1(cdfid, varid, indices, value, rc @@ -931,7 +931,7 @@ NCVPT1(cdfid, varid, indices, value, rco
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1020,7 +922,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long longs = *(int *)value; long longs = *(int *)value;
@@ -1031,7 +1031,7 @@ nncvpt(cdfid, varid, start, count, value @@ -1046,7 +1046,7 @@ NCVPT(cdfid, varid, start, count, value,
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1029,7 +931,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, ncount, ndims); long *longs = itol (value, ncount, ndims);
@@ -1142,7 +1142,7 @@ nncvptg(cdfid, varid, start, count, stri @@ -1158,7 +1158,7 @@ NCVPTG(cdfid, varid, start, count, strid
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -1038,7 +940,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1199,7 +1199,7 @@ nncvptg(cdfid, varid, start, count, stri @@ -1215,7 +1215,7 @@ NCVPTG(cdfid, varid, start, count, strid
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1047,7 +949,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itolg (value, ncount, nbasis, ndims); long *longs = itolg (value, ncount, nbasis, ndims);
@@ -1335,7 +1335,7 @@ nncvgt1(cdfid, varid, indices, value, rc @@ -1352,7 +1352,7 @@ NCVGT1(cdfid, varid, indices, value, rco
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1056,7 +958,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long longs; long longs;
@@ -1477,7 +1477,7 @@ nncvgt(cdfid, varid, start, count, value @@ -1495,7 +1495,7 @@ NCVGT(cdfid, varid, start, count, value,
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1065,7 +967,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1618,7 +1618,7 @@ nncvgtg(cdfid, varid, start, count, stri @@ -1629,7 +1629,7 @@ NCVGTG(cdfid, varid, start, count, strid
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -1074,7 +976,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1689,7 +1689,7 @@ nncvgtg(cdfid, varid, start, count, stri @@ -1700,7 +1700,7 @@ NCVGTG(cdfid, varid, start, count, strid
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1083,7 +985,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1855,7 +1855,7 @@ nncapt(cdfid, varid, attname, datatype, @@ -1869,7 +1869,7 @@ NCAPT(cdfid, varid, attnamed, datatype,
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1092,7 +994,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
#ifdef HDF #ifdef HDF
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, attlen, 1); long *longs = itol (value, attlen, 1);
@@ -2020,7 +2020,7 @@ nncagt(cdfid, varid, attname, value, rco @@ -2038,7 +2038,7 @@ NCAGT(cdfid, varid, attnamed, value, rco
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1100,11 +1002,11 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc HDF4.2r2/mfhdf/fortra
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ +#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = (long *) malloc (attlen * sizeof (long));
diff -up HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-unicos.c.ppc hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-unicos.c
--- HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c.ppc 2006-11-01 17:53:11.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-unicos.c.ppc 2010-01-17 21:24:52.000000000 -0700
+++ HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c 2007-10-17 22:48:25.000000000 +0200 +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-unicos.c 2010-02-01 13:19:15.311389425 -0700
@@ -34,7 +34,7 @@ @@ -39,7 +39,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
double dd; double dd;
@ -1113,7 +1015,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c.ppc HDF4.2r2/mfhdf/fortran
int ll; int ll;
#else #else
long ll; long ll;
@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm @@ -70,7 +70,7 @@ struct ncfils { /* This will be a comm
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
double dd; double dd;
@ -1122,7 +1024,7 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c.ppc HDF4.2r2/mfhdf/fortran
int ll; int ll;
#else #else
long ll; long ll;
@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims) @@ -436,7 +436,7 @@ stoig(shorts, ints, dims, basis, ndims)
} }
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -1131,7 +1033,25 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c.ppc HDF4.2r2/mfhdf/fortran
/* /*
* Convert multi-dimensional array of NCLONGs stored in ints to packed * Convert multi-dimensional array of NCLONGs stored in ints to packed
* array of longs, in malloc'ed space. Returns pointer to longs or NULL * array of longs, in malloc'ed space. Returns pointer to longs or NULL
@@ -1083,7 +1083,7 @@ nncvptg(cdfid, varid, start, count, stri @@ -932,7 +932,7 @@ NCVPT1(cdfid, varid, indices, value, rco
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long longs = *(int *)value;
@@ -1047,7 +1047,7 @@ NCVPT(cdfid, varid, start, count, value,
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, ncount, ndims);
@@ -1159,7 +1159,7 @@ NCVPTG(cdfid, varid, start, count, strid
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -1140,7 +1060,34 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c.ppc HDF4.2r2/mfhdf/fortran
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1437,7 +1437,7 @@ nncvgtg(cdfid, varid, start, count, stri @@ -1216,7 +1216,7 @@ NCVPTG(cdfid, varid, start, count, strid
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itolg (value, ncount, nbasis, ndims);
@@ -1353,7 +1353,7 @@ NCVGT1(cdfid, varid, indices, value, rco
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long longs;
@@ -1496,7 +1496,7 @@ NCVGT(cdfid, varid, start, count, value,
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1630,7 +1630,7 @@ NCVGTG(cdfid, varid, start, count, strid
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -1149,9 +1096,60 @@ diff -up HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c.ppc HDF4.2r2/mfhdf/fortran
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
diff -up HDF4.2r2/mfhdf/ncgen/ncgen.l.ppc HDF4.2r2/mfhdf/ncgen/ncgen.l @@ -1701,7 +1701,7 @@ NCVGTG(cdfid, varid, start, count, strid
--- HDF4.2r2/mfhdf/ncgen/ncgen.l.ppc 2003-12-10 22:15:54.000000000 +0100 return;
+++ HDF4.2r2/mfhdf/ncgen/ncgen.l 2007-10-17 22:48:25.000000000 +0200 } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1870,7 +1870,7 @@ NCAPT(cdfid, varid, attnamed, datatype,
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, attlen, 1);
@@ -2039,7 +2039,7 @@ NCAGT(cdfid, varid, attnamed, value, rco
return;
} /* else */
#endif /* FORTRAN_HAS_NO_SHORT */
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
#ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = (long *) malloc (attlen * sizeof (long));
diff -up hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.ppc hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h
--- hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.ppc 2010-01-17 21:24:52.000000000 -0700
+++ hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h 2010-02-01 13:19:15.307388000 -0700
@@ -304,7 +304,7 @@ typedef double ncdouble;
*/
#if defined _CRAYMPP
typedef short nclong;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
typedef int nclong;
#else
typedef long nclong; /* default, compatible type */
diff -up hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.ppc hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in
--- hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.ppc 2010-01-17 21:24:53.000000000 -0700
+++ hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in 2010-02-01 13:19:15.306389107 -0700
@@ -295,7 +295,7 @@ typedef double ncdouble;
*/
#if defined _CRAYMPP
typedef short nclong;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__
typedef int nclong;
#else
typedef long nclong; /* default, compatible type */
diff -up hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l.ppc hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l
--- hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l.ppc 2010-01-17 21:24:51.000000000 -0700
+++ hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l 2010-02-01 13:19:15.326387419 -0700
@@ -134,7 +134,7 @@ FloatInf|Infinity|Inf { /* float miss @@ -134,7 +134,7 @@ FloatInf|Infinity|Inf { /* float miss
yyerror(errstr); yyerror(errstr);
} }

169
hdf-4.2r2-s390.patch → hdf-4.2.4-s390.patch
Unescape View File

@ -1,5 +1,6 @@
--- HDF4.2r2/hdf/src/hdfi.h.orig 2008-02-04 17:27:04.000000000 +0100 diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.s390 hdf-4.2.4-snap8/hdf/src/hdfi.h
+++ HDF4.2r2/hdf/src/hdfi.h 2008-02-04 17:29:54.000000000 +0100 --- hdf-4.2.4-snap8/hdf/src/hdfi.h.s390 2010-02-01 13:28:25.387386871 -0700
+++ hdf-4.2.4-snap8/hdf/src/hdfi.h 2010-02-01 13:31:46.343387138 -0700
@@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@
#define DFMT_POWERPC64 0x1111 #define DFMT_POWERPC64 0x1111
#define DFMT_LINUXPPC 0x1111 #define DFMT_LINUXPPC 0x1111
@ -8,7 +9,7 @@
/* I/O library constants */ /* I/O library constants */
#define UNIXUNBUFIO 1 #define UNIXUNBUFIO 1
@@ -1505,6 +1506,66 @@ @@ -1453,6 +1454,66 @@ typedef int hdf_pint_t;
#endif /* Linux Sparc32/64 */ #endif /* Linux Sparc32/64 */
@ -72,33 +73,12 @@
+ +
+#endif /* Linux s390/s390x */ +#endif /* Linux s390/s390x */
+ +
/*#ifndef GOT_MACHINE /*-----------------------------------------------------*/
No machine type has been defined. Your Makefile needs to have someing like /* 64-bit Free BSD */
-DSUN or -DUNICOS in order for the HDF internal structures to be defined
--- HDF4.2r2/mfhdf/libsrc/netcdf.h.in.orig 2008-02-04 18:38:14.000000000 +0100 diff -up hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.s390 hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c
+++ HDF4.2r2/mfhdf/libsrc/netcdf.h.in 2008-02-04 18:39:00.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c.s390 2010-02-01 13:28:25.373389124 -0700
@@ -295,7 +295,7 @@ +++ hdf-4.2.4-snap8/mfhdf/fortran/config/jackets-linux.c 2010-02-01 13:28:25.419387130 -0700
*/
#if defined _CRAYMPP
typedef short nclong;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__ || defined __s390x__
typedef int nclong;
#else
typedef long nclong; /* default, compatible type */
--- HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h.orig 2008-02-04 18:40:01.000000000 +0100
+++ HDF4.2r2/mfhdf/libsrc/config/netcdf-linux.h 2008-02-04 18:40:29.000000000 +0100
@@ -304,7 +304,7 @@
*/
#if defined _CRAYMPP
typedef short nclong;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
typedef int nclong;
#else
typedef long nclong; /* default, compatible type */
--- HDF4.2r2/mfhdf/fortran/config/jackets-linux.c.orig 2008-02-04 18:42:44.000000000 +0100
+++ HDF4.2r2/mfhdf/fortran/config/jackets-linux.c 2008-02-04 18:44:19.000000000 +0100
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
@ -108,7 +88,7 @@
int ll; int ll;
#else #else
long ll; long ll;
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm
struct ncfils { /* This will be a common block from Fortran */ struct ncfils { /* This will be a common block from Fortran */
double dd; double dd;
@ -117,7 +97,7 @@
int ll; int ll;
#else #else
long ll; long ll;
@@ -430,7 +430,7 @@ @@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims)
} }
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -126,7 +106,7 @@
/* /*
* Convert multi-dimensional array of NCLONGs stored in ints to packed * Convert multi-dimensional array of NCLONGs stored in ints to packed
* array of longs, in malloc'ed space. Returns pointer to longs or NULL * array of longs, in malloc'ed space. Returns pointer to longs or NULL
@@ -916,7 +916,7 @@ @@ -916,7 +916,7 @@ nncvpt1(cdfid, varid, indices, value, rc
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -135,7 +115,7 @@
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long longs = *(int *)value; long longs = *(int *)value;
@@ -1030,7 +1030,7 @@ @@ -1030,7 +1030,7 @@ nncvpt(cdfid, varid, start, count, value
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -144,7 +124,7 @@
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, ncount, ndims); long *longs = itol (value, ncount, ndims);
@@ -1141,7 +1141,7 @@ @@ -1141,7 +1141,7 @@ nncvptg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -153,7 +133,7 @@
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1198,7 +1198,7 @@ @@ -1198,7 +1198,7 @@ nncvptg(cdfid, varid, start, count, stri
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -162,7 +142,7 @@
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itolg (value, ncount, nbasis, ndims); long *longs = itolg (value, ncount, nbasis, ndims);
@@ -1334,7 +1334,7 @@ @@ -1334,7 +1334,7 @@ nncvgt1(cdfid, varid, indices, value, rc
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -171,7 +151,7 @@
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long longs; long longs;
@@ -1476,7 +1476,7 @@ @@ -1476,7 +1476,7 @@ nncvgt(cdfid, varid, start, count, value
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -180,7 +160,7 @@
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1614,7 +1614,7 @@ @@ -1614,7 +1614,7 @@ nncvgtg(cdfid, varid, start, count, stri
tmpbasis = nctypelen(NC_LONG); tmpbasis = nctypelen(NC_LONG);
else else
#endif #endif
@ -189,7 +169,7 @@
if (datatype == NC_LONG) if (datatype == NC_LONG)
tmpbasis = sizeof(int); tmpbasis = sizeof(int);
else else
@@ -1685,7 +1685,7 @@ @@ -1685,7 +1685,7 @@ nncvgtg(cdfid, varid, start, count, stri
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -198,7 +178,7 @@
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long iocount = dimprod (ncount, ndims); /* product of dimensions */ long iocount = dimprod (ncount, ndims); /* product of dimensions */
@@ -1851,7 +1851,7 @@ @@ -1851,7 +1851,7 @@ nncapt(cdfid, varid, attname, datatype,
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -207,7 +187,7 @@
#ifdef HDF #ifdef HDF
if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
long *longs = itol (value, attlen, 1); long *longs = itol (value, attlen, 1);
@@ -2016,7 +2016,7 @@ @@ -2016,7 +2016,7 @@ nncagt(cdfid, varid, attname, value, rco
return; return;
} /* else */ } /* else */
#endif /* FORTRAN_HAS_NO_SHORT */ #endif /* FORTRAN_HAS_NO_SHORT */
@ -216,30 +196,23 @@
#ifdef HDF #ifdef HDF
if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
/* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes
--- HDF4.2r2/mfhdf/ncgen/ncgen.l.orig 2008-02-04 18:45:37.000000000 +0100 diff -up hdf-4.2.4-snap8/mfhdf/libsrc/array.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/array.c
+++ HDF4.2r2/mfhdf/ncgen/ncgen.l 2008-02-04 18:45:53.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/libsrc/array.c.s390 2010-01-17 21:24:53.000000000 -0700
@@ -134,7 +134,7 @@ +++ hdf-4.2.4-snap8/mfhdf/libsrc/array.c 2010-02-01 13:28:25.422387595 -0700
yyerror(errstr); @@ -622,7 +622,7 @@ xdr_NC_array(xdrs, app)
}
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
if (dd < INT_MIN || dd > INT_MAX)
#else
#if defined (_CRAYMPP)
--- HDF4.2r2/mfhdf/libsrc/putget.c.orig 2008-02-04 18:53:56.000000000 +0100
+++ HDF4.2r2/mfhdf/libsrc/putget.c 2008-02-04 18:53:13.000000000 +0100
@@ -594,7 +594,7 @@
case NC_LONG : case NC_LONG :
#if defined _CRAYMPP #if defined _CRAYMPP
return( xdr_short(xdrs, (nclong *)values) ) ; xdr_NC_fnct = xdr_short;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
return( xdr_int(xdrs, (nclong *)values) ) ; xdr_NC_fnct = xdr_int ;
#else #else
return( xdr_long(xdrs, (nclong *)values) ) ; xdr_NC_fnct = xdr_long ;
@@ -1896,7 +1896,7 @@ diff -up hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c
case NC_LONG : --- hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c.s390 2010-01-17 21:24:53.000000000 -0700
+++ hdf-4.2.4-snap8/mfhdf/libsrc/cdf.c 2010-02-01 13:28:25.424387272 -0700
@@ -3657,7 +3657,7 @@ NC_var *vp ;
alen /= 4 ;
#if defined _CRAYMPP #if defined _CRAYMPP
xdr_NC_fnct = xdr_short; xdr_NC_fnct = xdr_short;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
@ -247,21 +220,44 @@
xdr_NC_fnct = xdr_int ; xdr_NC_fnct = xdr_int ;
#else #else
xdr_NC_fnct = xdr_long ; xdr_NC_fnct = xdr_long ;
--- HDF4.2r2/mfhdf/libsrc/array.c.orig 2008-02-04 18:54:30.000000000 +0100 diff -up hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.s390 hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h
+++ HDF4.2r2/mfhdf/libsrc/array.c 2008-02-04 18:54:39.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h.s390 2010-02-01 13:28:25.380387278 -0700
@@ -622,7 +622,7 @@ +++ hdf-4.2.4-snap8/mfhdf/libsrc/config/netcdf-linux.h 2010-02-01 13:28:25.418387640 -0700
@@ -304,7 +304,7 @@ typedef double ncdouble;
*/
#if defined _CRAYMPP
typedef short nclong;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
typedef int nclong;
#else
typedef long nclong; /* default, compatible type */
diff -up hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.s390 hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in
--- hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in.s390 2010-02-01 13:28:25.380387278 -0700
+++ hdf-4.2.4-snap8/mfhdf/libsrc/netcdf.h.in 2010-02-01 13:28:25.417387775 -0700
@@ -295,7 +295,7 @@ typedef double ncdouble;
*/
#if defined _CRAYMPP
typedef short nclong;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__ || defined __s390x__
typedef int nclong;
#else
typedef long nclong; /* default, compatible type */
diff -up hdf-4.2.4-snap8/mfhdf/libsrc/putget.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/putget.c
--- hdf-4.2.4-snap8/mfhdf/libsrc/putget.c.s390 2010-01-17 21:24:53.000000000 -0700
+++ hdf-4.2.4-snap8/mfhdf/libsrc/putget.c 2010-02-01 13:28:25.421386028 -0700
@@ -652,7 +652,7 @@ Void *values ;
case NC_LONG : case NC_LONG :
#if defined _CRAYMPP #if defined _CRAYMPP
xdr_NC_fnct = xdr_short; return( xdr_short(xdrs, (nclong *)values) ) ;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__ +#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
xdr_NC_fnct = xdr_int ; return( xdr_int(xdrs, (nclong *)values) ) ;
#else #else
xdr_NC_fnct = xdr_long ; return( xdr_long(xdrs, (nclong *)values) ) ;
--- HDF4.2r2/mfhdf/libsrc/cdf.c.orig 2008-02-04 18:55:23.000000000 +0100 @@ -1966,7 +1966,7 @@ Void *values ;
+++ HDF4.2r2/mfhdf/libsrc/cdf.c 2008-02-04 18:55:38.000000000 +0100 case NC_LONG :
@@ -3664,7 +3664,7 @@
alen /= 4 ;
#if defined _CRAYMPP #if defined _CRAYMPP
xdr_NC_fnct = xdr_short; xdr_NC_fnct = xdr_short;
-#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ -#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
@ -269,9 +265,10 @@
xdr_NC_fnct = xdr_int ; xdr_NC_fnct = xdr_int ;
#else #else
xdr_NC_fnct = xdr_long ; xdr_NC_fnct = xdr_long ;
--- HDF4.2r2/mfhdf/libsrc/xdrposix.c.orig 2008-02-04 18:56:24.000000000 +0100 diff -up hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c.s390 hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c
+++ HDF4.2r2/mfhdf/libsrc/xdrposix.c 2008-02-04 18:58:43.000000000 +0100 --- hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c.s390 2010-01-17 21:24:53.000000000 -0700
@@ -284,7 +284,7 @@ +++ hdf-4.2.4-snap8/mfhdf/libsrc/xdrposix.c 2010-02-01 13:28:25.425387348 -0700
@@ -283,7 +283,7 @@ int nbytes;
static bool_t xdrposix_getlong(); static bool_t xdrposix_getlong();
static bool_t xdrposix_putlong(); static bool_t xdrposix_putlong();
@ -280,7 +277,7 @@
static bool_t xdrposix_getint(); static bool_t xdrposix_getint();
static bool_t xdrposix_putint(); static bool_t xdrposix_putint();
#endif #endif
@@ -301,7 +301,7 @@ @@ -300,7 +300,7 @@ static long * xdrposix_inline();
#if (defined __sun && defined _LP64) #if (defined __sun && defined _LP64)
static rpc_inline_t * xdrposix_inline(); static rpc_inline_t * xdrposix_inline();
#else #else
@ -289,7 +286,7 @@
static int32_t * xdrposix_inline(); static int32_t * xdrposix_inline();
#else #else
#if (defined __alpha ) #if (defined __alpha )
@@ -332,9 +332,9 @@ @@ -331,9 +331,9 @@ static struct xdr_ops xdrposix_ops = {
xdrposix_getpos, /* get offset in the stream */ xdrposix_getpos, /* get offset in the stream */
xdrposix_setpos, /* set offset in the stream */ xdrposix_setpos, /* set offset in the stream */
xdrposix_inline, /* prime stream for inline macros */ xdrposix_inline, /* prime stream for inline macros */
@ -301,7 +298,7 @@
NULL, /* no xdr_control function defined */ NULL, /* no xdr_control function defined */
#endif #endif
/* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */ /* Solaris 64-bit (arch=v9 and arch=amd64) has 64 bits long and 32 bits int. */
@@ -469,7 +469,7 @@ @@ -468,7 +468,7 @@ xdrposix_getlong(xdrs, lp)
#endif #endif
{ {
unsigned char *up = (unsigned char *)lp ; unsigned char *up = (unsigned char *)lp ;
@ -310,7 +307,7 @@
*lp = 0 ; *lp = 0 ;
up += (sizeof(long) - 4) ; up += (sizeof(long) - 4) ;
#endif #endif
@@ -496,7 +496,7 @@ @@ -495,7 +495,7 @@ xdrposix_putlong(xdrs, lp)
netlong mycopy = htonl(*lp); netlong mycopy = htonl(*lp);
up = (unsigned char *)&mycopy; up = (unsigned char *)&mycopy;
#endif #endif
@ -319,7 +316,7 @@
up += (sizeof(long) - 4) ; up += (sizeof(long) - 4) ;
#endif #endif
@@ -593,7 +593,7 @@ @@ -592,7 +592,7 @@ static rpc_inline_t *
#if (defined __alpha) #if (defined __alpha)
static int* static int*
#else #else
@ -328,7 +325,7 @@
static int32_t * static int32_t *
#else #else
static netlong * static netlong *
@@ -622,7 +622,7 @@ @@ -621,7 +621,7 @@ int
return (NULL); return (NULL);
} }
@ -337,3 +334,15 @@
static bool_t static bool_t
xdrposix_getint(xdrs, lp) xdrposix_getint(xdrs, lp)
diff -up hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l.s390 hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l
--- hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l.s390 2010-02-01 13:28:25.381387100 -0700
+++ hdf-4.2.4-snap8/mfhdf/ncgen/ncgen.l 2010-02-01 13:28:25.420387234 -0700
@@ -134,7 +134,7 @@ FloatInf|Infinity|Inf { /* float miss
yyerror(errstr);
}
-#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ || defined __s390x__
if (dd < INT_MIN || dd > INT_MAX)
#else
#if defined (_CRAYMPP)

14
hdf-4.2r2-sparc.patch → hdf-4.2.4-sparc.patch
Unescape View File

@ -1,6 +1,6 @@
diff -Nru HDF4.2r2.orig/hdf/src/hdfi.h HDF4.2r2/hdf/src/hdfi.h diff -up hdf-4.2.4-snap8/hdf/src/hdfi.h.sparc hdf-4.2.4-snap8/hdf/src/hdfi.h
--- HDF4.2r2.orig/hdf/src/hdfi.h 2007-09-17 18:45:17.000000000 +0300 --- hdf-4.2.4-snap8/hdf/src/hdfi.h.sparc 2010-02-01 13:28:25.361387271 -0700
+++ HDF4.2r2/hdf/src/hdfi.h 2008-01-06 07:23:42.000000000 +0200 +++ hdf-4.2.4-snap8/hdf/src/hdfi.h 2010-02-01 13:31:46.343387138 -0700
@@ -77,6 +77,7 @@ @@ -77,6 +77,7 @@
#define DFMT_LINUX64 0x4441 #define DFMT_LINUX64 0x4441
#define DFMT_POWERPC64 0x1111 #define DFMT_POWERPC64 0x1111
@ -9,7 +9,7 @@ diff -Nru HDF4.2r2.orig/hdf/src/hdfi.h HDF4.2r2/hdf/src/hdfi.h
/* I/O library constants */ /* I/O library constants */
#define UNIXUNBUFIO 1 #define UNIXUNBUFIO 1
@@ -1444,6 +1445,66 @@ @@ -1392,6 +1393,66 @@ typedef long hdf_pint_t;
#endif /*Linux PPC */ #endif /*Linux PPC */
@ -73,6 +73,6 @@ diff -Nru HDF4.2r2.orig/hdf/src/hdfi.h HDF4.2r2/hdf/src/hdfi.h
+ +
+#endif /* Linux Sparc32/64 */ +#endif /* Linux Sparc32/64 */
+ +
/*#ifndef GOT_MACHINE /*-----------------------------------------------------*/
No machine type has been defined. Your Makefile needs to have someing like /* 64-bit Free BSD */
-DSUN or -DUNICOS in order for the HDF internal structures to be defined

11
hdf-4.2.5-maxavailfiles.patch
Unescape View File

@ -0,0 +1,11 @@
--- hdf-4.2.5-pre1/mfhdf/libsrc/file.c.maxavailfiles 2010-02-06 10:40:42.000000000 -0700
+++ hdf-4.2.5-pre1/mfhdf/libsrc/file.c 2010-02-09 13:53:09.600285597 -0700
@@ -51,7 +51,7 @@
be in hlimits.h file in the future. EIP 2010-02-01*/
#define H4_MAX_AVAIL_OPENFILES 20000
-#define MAX_AVAIL_OPENFILES (((MAX_SYS_OPENFILES - 3) > H4_MAX_AVAIL_OPENFILES) ? H4_MAX_AVAIL_OPENFILES : (MAX_SYS_OPENFILES - 3))
+#define MAX_AVAIL_OPENFILES (((MAX_SYS_OPENFILES - 10) > H4_MAX_AVAIL_OPENFILES) ? H4_MAX_AVAIL_OPENFILES : (MAX_SYS_OPENFILES - 10))
static int _curr_opened = 0 ; /* the number of files currently opened */
/* NOTE: _ncdf might have been the number of files currently opened, yet it

11
hdf-4.2r3-maxavailfiles.patch
Unescape View File

@ -1,11 +0,0 @@
--- HDF4.2r3/mfhdf/libsrc/file.c.maxavailfiles 2008-01-27 09:47:11.000000000 -0700
+++ HDF4.2r3/mfhdf/libsrc/file.c 2008-10-01 11:48:53.000000000 -0600
@@ -45,7 +45,7 @@
/* Maximum number of files can be opened at one time; subtract 3 from
the system allowed to account for stdin, stdout, and stderr */
-#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 3)
+#define MAX_AVAIL_OPENFILES (MAX_SYS_OPENFILES - 10)
static int _curr_opened = 0 ; /* the number of files currently opened */
/* NOTE: _ncdf might have been the number of files currently opened, yet it
Write Preview
Loading…
Cancel
Save