diff --git a/hdf-4.2r1-ppc.patch b/hdf-4.2r2-ppc.patch similarity index 83% rename from hdf-4.2r1-ppc.patch rename to hdf-4.2r2-ppc.patch index c299cdd..1195bc7 100644 --- a/hdf-4.2r1-ppc.patch +++ b/hdf-4.2r2-ppc.patch @@ -1,6 +1,122 @@ -diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran/config/jackets-aix.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c 2005-02-09 04:04:10.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-aix.c 2007-05-10 23:36:44.000000000 +0200 +diff -up HDF4.2r2/hdf/src/hdfi.h.ppc HDF4.2r2/hdf/src/hdfi.h +--- HDF4.2r2/hdf/src/hdfi.h.ppc 2007-09-17 17:45:17.000000000 +0200 ++++ HDF4.2r2/hdf/src/hdfi.h 2007-10-17 23:04:40.000000000 +0200 +@@ -76,6 +76,7 @@ + #define DFMT_IA64 0x4441 + #define DFMT_LINUX64 0x4441 + #define DFMT_POWERPC64 0x1111 ++#define DFMT_LINUXPPC 0x1111 + + /* I/O library constants */ + #define UNIXUNBUFIO 1 +@@ -1392,6 +1393,57 @@ typedef long hdf_pint_t; + + #endif /*Linux 64 */ + ++/* Linux PPC */ ++#if defined __powerpc__ && !defined __powerpc64__ ++ ++#ifdef GOT_MACHINE ++If you get an error on this line more than one machine type has been defined. ++Please check your Makefile. ++#endif ++#define GOT_MACHINE ++ ++#include /* for unbuffered i/o stuff */ ++#include ++#define DF_MT DFMT_LINUXPPC ++typedef void VOID; ++typedef void *VOIDP; ++typedef char *_fcd; ++typedef char char8; ++typedef unsigned char uchar8; ++typedef char int8; ++typedef unsigned char uint8; ++typedef short int int16; ++typedef unsigned short int uint16; ++typedef int int32; ++typedef unsigned int uint32; ++typedef int intn; ++typedef unsigned int uintn; ++typedef int intf; /* size of INTEGERs in Fortran compiler */ ++typedef float float32; ++typedef double float64; ++typedef long hdf_pint_t; /* an integer the same size as a pointer */ ++#define FNAME_POST_UNDERSCORE ++#define _fcdtocp(desc) (desc) ++#ifdef HAVE_FMPOOL ++#define FILELIB PAGEBUFIO /* enable page buffering */ ++#else ++#define FILELIB UNIXBUFIO ++#endif ++ ++/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ ++ ++/* Determine the memory manager we are going to use. Valid values are: */ ++/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ ++/* what each does */ ++#define JMEMSYS MEM_ANSI ++ ++#ifdef __GNUC__ ++#define HAVE_STDC ++#define INCLUDES_ARE_ANSI ++#endif ++ ++#endif /*Linux PPC */ ++ + /*#ifndef GOT_MACHINE + No machine type has been defined. Your Makefile needs to have someing like + -DSUN or -DUNICOS in order for the HDF internal structures to be defined +diff -up HDF4.2r2/mfhdf/libsrc/cdf.c.ppc HDF4.2r2/mfhdf/libsrc/cdf.c +diff -up HDF4.2r2/mfhdf/libsrc/hdftest.c.ppc HDF4.2r2/mfhdf/libsrc/hdftest.c +diff -up HDF4.2r2/mfhdf/libsrc/local_nc.h.ppc HDF4.2r2/mfhdf/libsrc/local_nc.h +--- HDF4.2r2/mfhdf/libsrc/local_nc.h.ppc 2007-09-17 07:01:50.000000000 +0200 ++++ HDF4.2r2/mfhdf/libsrc/local_nc.h 2007-10-17 22:48:25.000000000 +0200 +@@ -66,6 +66,15 @@ + #endif /* !macintosh */ + #endif /* NO_SYSTEM_XDR_INCLUDES */ + ++#ifndef SWAP ++#ifdef __GLIBC__ ++#include ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++#define SWAP ++#endif ++#endif /* __GLIBC__ */ ++#endif /* !SWAP */ ++ + #include "netcdf.h" /* needed for defs of nc_type, ncvoid, ... */ + + /* ptr argument type in internal functions */ +diff -up HDF4.2r2/mfhdf/libsrc/array.c.ppc HDF4.2r2/mfhdf/libsrc/array.c +diff -up HDF4.2r2/mfhdf/libsrc/putget.c.ppc HDF4.2r2/mfhdf/libsrc/putget.c +diff -up HDF4.2r2/mfhdf/libsrc/netcdf.h.in.ppc HDF4.2r2/mfhdf/libsrc/netcdf.h.in +--- 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 @@ struct ncfils { /* This will be a common block from Fortran */ @@ -10,7 +126,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran int ll; #else 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 */ double dd; @@ -19,7 +135,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran int ll; #else long ll; -@@ -430,7 +430,7 @@ +@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims) } #endif /* FORTRAN_HAS_NO_SHORT */ @@ -28,7 +144,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran /* * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -917,7 +917,7 @@ +@@ -917,7 +917,7 @@ nncvpt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -37,7 +153,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs = *(int *)value; -@@ -1031,7 +1031,7 @@ +@@ -1031,7 +1031,7 @@ nncvpt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -46,7 +162,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, ncount, ndims); -@@ -1142,7 +1142,7 @@ +@@ -1142,7 +1142,7 @@ nncvptg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -55,7 +171,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1199,7 +1199,7 @@ +@@ -1199,7 +1199,7 @@ nncvptg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -64,7 +180,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1335,7 +1335,7 @@ +@@ -1335,7 +1335,7 @@ nncvgt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -73,7 +189,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs; -@@ -1477,7 +1477,7 @@ +@@ -1477,7 +1477,7 @@ nncvgt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -82,46 +198,46 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-aix.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1616,7 +1616,7 @@ +@@ -1615,7 +1615,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); -@@ -1688,7 +1688,7 @@ + else +@@ -1686,7 +1686,7 @@ nncvgtg(cdfid, varid, start, count, stri 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) { -@@ -1855,7 +1855,7 @@ + long iocount = dimprod (ncount, ndims); /* product of dimensions */ +@@ -1852,7 +1852,7 @@ nncapt(cdfid, varid, attname, 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) { -@@ -2021,7 +2021,7 @@ + long *longs = itol (value, attlen, 1); +@@ -2017,7 +2017,7 @@ nncagt(cdfid, varid, attname, 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) { -diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortran/config/jackets-alpha.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c 2005-02-09 04:04:10.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-alpha.c 2007-05-10 23:38:28.000000000 +0200 -@@ -34,7 +34,7 @@ + /* 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-t3e.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c +--- HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c.ppc 2005-02-09 04:04:19.000000000 +0100 ++++ HDF4.2r2/mfhdf/fortran/config/jackets-t3e.c 2007-10-17 22:48:25.000000000 +0200 +@@ -39,7 +39,7 @@ struct ncfils { /* This will be a common block from Fortran */ double dd; @@ -130,7 +246,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr int ll; #else long ll; -@@ -65,7 +65,7 @@ +@@ -70,7 +70,7 @@ struct ncfils { /* This will be a comm struct ncfils { /* This will be a common block from Fortran */ double dd; @@ -139,7 +255,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr int ll; #else long ll; -@@ -430,7 +430,7 @@ +@@ -435,7 +435,7 @@ stoig(shorts, ints, dims, basis, ndims) } #endif /* FORTRAN_HAS_NO_SHORT */ @@ -148,7 +264,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr /* * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -917,7 +917,7 @@ +@@ -931,7 +931,7 @@ NCVPT1(cdfid, varid, indices, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -157,7 +273,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs = *(int *)value; -@@ -1031,7 +1031,7 @@ +@@ -1046,7 +1046,7 @@ NCVPT(cdfid, varid, start, count, value, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -166,7 +282,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, ncount, ndims); -@@ -1142,7 +1142,7 @@ +@@ -1158,7 +1158,7 @@ NCVPTG(cdfid, varid, start, count, strid tmpbasis = nctypelen(NC_LONG); else #endif @@ -175,7 +291,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1199,7 +1199,7 @@ +@@ -1215,7 +1215,7 @@ NCVPTG(cdfid, varid, start, count, strid return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -184,7 +300,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1335,7 +1335,7 @@ +@@ -1352,7 +1352,7 @@ NCVGT1(cdfid, varid, indices, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -193,7 +309,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs; -@@ -1477,7 +1477,7 @@ +@@ -1495,7 +1495,7 @@ NCVGT(cdfid, varid, start, count, value, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -202,7 +318,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1618,7 +1618,7 @@ +@@ -1629,7 +1629,7 @@ NCVGTG(cdfid, varid, start, count, strid tmpbasis = nctypelen(NC_LONG); else #endif @@ -211,7 +327,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1689,7 +1689,7 @@ +@@ -1700,7 +1700,7 @@ NCVGTG(cdfid, varid, start, count, strid return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -220,7 +336,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1855,7 +1855,7 @@ +@@ -1869,7 +1869,7 @@ NCAPT(cdfid, varid, attnamed, datatype, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -229,7 +345,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, attlen, 1); -@@ -2020,7 +2020,7 @@ +@@ -2038,7 +2038,7 @@ NCAGT(cdfid, varid, attnamed, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -237,107 +353,11 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-alpha.c work/mfhdf/fortr +#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) { - -diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-apple.c work/mfhdf/fortran/config/jackets-apple.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-apple.c 2005-02-09 04:04:11.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-apple.c 2007-05-10 23:38:35.000000000 +0200 -@@ -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 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 @@ - } - #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 -@@ -1177,7 +1177,7 @@ - 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); -@@ -1556,7 +1556,7 @@ - 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 -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-fbsd.c work/mfhdf/fortran/config/jackets-fbsd.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-fbsd.c 2005-02-09 04:04:12.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-fbsd.c 2007-05-10 23:38:01.000000000 +0200 -@@ -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 - long ll; -@@ -65,7 +65,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 - long ll; -@@ -430,7 +430,7 @@ - } - #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 - * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -1083,7 +1083,7 @@ - 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); - else -@@ -1437,7 +1437,7 @@ - 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); - else -diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortran/config/jackets-hpux.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c 2005-02-09 04:04:13.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-hpux.c 2007-05-10 23:38:14.000000000 +0200 -@@ -34,7 +34,7 @@ + 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 +--- HDF4.2r2/mfhdf/fortran/config/jackets-unicos.c.ppc 2005-02-09 04:04:19.000000000 +0100 ++++ HDF4.2r2/mfhdf/fortran/config/jackets-unicos.c 2007-10-17 22:48:25.000000000 +0200 +@@ -39,7 +39,7 @@ struct ncfils { /* This will be a common block from Fortran */ double dd; @@ -346,7 +366,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra int ll; #else long ll; -@@ -65,7 +65,7 @@ +@@ -70,7 +70,7 @@ struct ncfils { /* This will be a comm struct ncfils { /* This will be a common block from Fortran */ double dd; @@ -355,7 +375,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra int ll; #else long ll; -@@ -430,7 +430,7 @@ +@@ -436,7 +436,7 @@ stoig(shorts, ints, dims, basis, ndims) } #endif /* FORTRAN_HAS_NO_SHORT */ @@ -364,7 +384,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra /* * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -917,7 +917,7 @@ +@@ -932,7 +932,7 @@ NCVPT1(cdfid, varid, indices, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -373,7 +393,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs = *(int *)value; -@@ -1031,7 +1031,7 @@ +@@ -1047,7 +1047,7 @@ NCVPT(cdfid, varid, start, count, value, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -382,7 +402,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, ncount, ndims); -@@ -1142,7 +1142,7 @@ +@@ -1159,7 +1159,7 @@ NCVPTG(cdfid, varid, start, count, strid tmpbasis = nctypelen(NC_LONG); else #endif @@ -391,7 +411,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1199,7 +1199,7 @@ +@@ -1216,7 +1216,7 @@ NCVPTG(cdfid, varid, start, count, strid return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -400,7 +420,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1335,7 +1335,7 @@ +@@ -1353,7 +1353,7 @@ NCVGT1(cdfid, varid, indices, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -409,7 +429,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs; -@@ -1477,7 +1477,7 @@ +@@ -1496,7 +1496,7 @@ NCVGT(cdfid, varid, start, count, value, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -418,7 +438,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1616,7 +1616,7 @@ +@@ -1630,7 +1630,7 @@ NCVGTG(cdfid, varid, start, count, strid tmpbasis = nctypelen(NC_LONG); else #endif @@ -427,7 +447,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1687,7 +1687,7 @@ +@@ -1701,7 +1701,7 @@ NCVGTG(cdfid, varid, start, count, strid return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -436,7 +456,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1853,7 +1853,7 @@ +@@ -1870,7 +1870,7 @@ NCAPT(cdfid, varid, attnamed, datatype, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -445,7 +465,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, attlen, 1); -@@ -2018,7 +2018,7 @@ +@@ -2039,7 +2039,7 @@ NCAGT(cdfid, varid, attnamed, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -453,10 +473,10 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-hpux.c work/mfhdf/fortra +#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) { - /*EIP We need to use int buffer to read data in on the platforms where long is 8 bytes -diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortran/config/jackets-irix6.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c 2005-02-09 04:04:16.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-irix6.c 2007-05-10 23:37:19.000000000 +0200 + long *longs = (long *) malloc (attlen * sizeof (long)); +diff -up HDF4.2r2/mfhdf/fortran/config/jackets-aix.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-aix.c +--- HDF4.2r2/mfhdf/fortran/config/jackets-aix.c.ppc 2006-11-01 17:53:11.000000000 +0100 ++++ HDF4.2r2/mfhdf/fortran/config/jackets-aix.c 2007-10-17 22:48:25.000000000 +0200 @@ -34,7 +34,7 @@ struct ncfils { /* This will be a common block from Fortran */ @@ -466,7 +486,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortr int ll; #else 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 */ double dd; @@ -475,7 +495,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortr int ll; #else long ll; -@@ -430,7 +430,7 @@ +@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims) } #endif /* FORTRAN_HAS_NO_SHORT */ @@ -484,7 +504,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortr /* * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -917,7 +917,7 @@ +@@ -917,7 +917,7 @@ nncvpt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -493,7 +513,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs = *(int *)value; -@@ -1031,7 +1031,7 @@ +@@ -1031,7 +1031,7 @@ nncvpt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -502,7 +522,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, ncount, ndims); -@@ -1142,7 +1142,7 @@ +@@ -1142,7 +1142,7 @@ nncvptg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -511,7 +531,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortr if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1199,7 +1199,7 @@ +@@ -1199,7 +1199,7 @@ nncvptg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -520,7 +540,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1335,7 +1335,7 @@ +@@ -1335,7 +1335,7 @@ nncvgt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -529,7 +549,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs; -@@ -1477,7 +1477,7 @@ +@@ -1477,7 +1477,7 @@ nncvgt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -538,45 +558,45 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-irix6.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1615,7 +1615,7 @@ +@@ -1616,7 +1616,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); - else -@@ -1686,7 +1686,7 @@ +@@ -1688,7 +1688,7 @@ nncvgtg(cdfid, varid, start, count, stri 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 */ -@@ -1852,7 +1852,7 @@ +@@ -1855,7 +1855,7 @@ nncapt(cdfid, varid, attname, 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); -@@ -2017,7 +2017,7 @@ +@@ -2021,7 +2021,7 @@ nncagt(cdfid, varid, attname, 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) { - /* EIP We need int buffer to read data in on the platfroms where long is 8 bytes -diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortran/config/jackets-linux.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c 2005-02-09 04:04:16.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-linux.c 2007-05-10 23:37:46.000000000 +0200 +diff -up HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c +--- HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c.ppc 2006-11-01 17:53:11.000000000 +0100 ++++ HDF4.2r2/mfhdf/fortran/config/jackets-solaris.c 2007-10-17 22:48:25.000000000 +0200 @@ -34,7 +34,7 @@ struct ncfils { /* This will be a common block from Fortran */ @@ -586,7 +606,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr int ll; #else 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 */ double dd; @@ -595,7 +615,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr int ll; #else long ll; -@@ -430,7 +430,7 @@ +@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims) } #endif /* FORTRAN_HAS_NO_SHORT */ @@ -604,7 +624,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr /* * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -993,7 +993,7 @@ +@@ -917,7 +917,7 @@ nncvpt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -613,7 +633,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs = *(int *)value; -@@ -1115,7 +1115,7 @@ +@@ -1031,7 +1031,7 @@ nncvpt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -622,7 +642,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, ncount, ndims); -@@ -1234,7 +1234,7 @@ +@@ -1142,7 +1142,7 @@ nncvptg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -631,7 +651,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1291,7 +1291,7 @@ +@@ -1199,7 +1199,7 @@ nncvptg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -640,7 +660,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1435,7 +1435,7 @@ +@@ -1335,7 +1335,7 @@ nncvgt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -649,7 +669,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs; -@@ -1585,7 +1585,7 @@ +@@ -1477,7 +1477,7 @@ nncvgt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -658,7 +678,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1731,7 +1731,7 @@ +@@ -1617,7 +1617,7 @@ nncvgtg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -667,7 +687,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1802,7 +1802,7 @@ +@@ -1688,7 +1688,7 @@ nncvgtg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -676,7 +696,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1980,7 +1980,7 @@ +@@ -1854,7 +1854,7 @@ nncapt(cdfid, varid, attname, datatype, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -685,7 +705,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, attlen, 1); -@@ -2157,7 +2157,7 @@ +@@ -2019,7 +2019,7 @@ nncagt(cdfid, varid, attname, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -693,10 +713,10 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-linux.c work/mfhdf/fortr +#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) { - /* EIP We need to use int buffer to read data in on the platforms where long is 8 bytes -diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/fortran/config/jackets-solaris.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c 2005-02-09 04:04:17.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-solaris.c 2007-05-10 23:38:20.000000000 +0200 + /* EIP +diff -up HDF4.2r2/mfhdf/fortran/config/jackets-linux.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-linux.c +--- HDF4.2r2/mfhdf/fortran/config/jackets-linux.c.ppc 2006-11-01 17:53:11.000000000 +0100 ++++ HDF4.2r2/mfhdf/fortran/config/jackets-linux.c 2007-10-17 22:48:25.000000000 +0200 @@ -34,7 +34,7 @@ struct ncfils { /* This will be a common block from Fortran */ @@ -706,7 +726,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for int ll; #else 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 */ double dd; @@ -715,7 +735,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for int ll; #else long ll; -@@ -430,7 +430,7 @@ +@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims) } #endif /* FORTRAN_HAS_NO_SHORT */ @@ -724,7 +744,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for /* * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -917,7 +917,7 @@ +@@ -916,7 +916,7 @@ nncvpt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -733,7 +753,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs = *(int *)value; -@@ -1031,7 +1031,7 @@ +@@ -1030,7 +1030,7 @@ nncvpt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -742,7 +762,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, ncount, ndims); -@@ -1142,7 +1142,7 @@ +@@ -1141,7 +1141,7 @@ nncvptg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -751,7 +771,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1199,7 +1199,7 @@ +@@ -1198,7 +1198,7 @@ nncvptg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -760,7 +780,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1335,7 +1335,7 @@ +@@ -1334,7 +1334,7 @@ nncvgt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -769,7 +789,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs; -@@ -1477,7 +1477,7 @@ +@@ -1476,7 +1476,7 @@ nncvgt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -778,7 +798,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1617,7 +1617,7 @@ +@@ -1614,7 +1614,7 @@ nncvgtg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -787,7 +807,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1688,7 +1688,7 @@ +@@ -1685,7 +1685,7 @@ nncvgtg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -796,7 +816,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1854,7 +1854,7 @@ +@@ -1851,7 +1851,7 @@ nncapt(cdfid, varid, attname, datatype, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -805,7 +825,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, attlen, 1); -@@ -2019,7 +2019,7 @@ +@@ -2016,7 +2016,7 @@ nncagt(cdfid, varid, attname, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -813,11 +833,59 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-solaris.c work/mfhdf/for +#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) { - /* EIP -diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran/config/jackets-t3e.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c 2005-02-09 04:04:19.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-t3e.c 2007-05-10 23:37:27.000000000 +0200 -@@ -39,7 +39,7 @@ + /* 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 +--- HDF4.2r2/mfhdf/fortran/config/jackets-apple.c.ppc 2006-11-01 17:53:11.000000000 +0100 ++++ HDF4.2r2/mfhdf/fortran/config/jackets-apple.c 2007-10-17 22:48:25.000000000 +0200 +@@ -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 @@ struct ncfils { /* This will be a common block from Fortran */ double dd; @@ -826,7 +894,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran int ll; #else long ll; -@@ -70,7 +70,7 @@ +@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm struct ncfils { /* This will be a common block from Fortran */ double dd; @@ -835,7 +903,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran int ll; #else long ll; -@@ -435,7 +435,7 @@ +@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims) } #endif /* FORTRAN_HAS_NO_SHORT */ @@ -844,7 +912,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran /* * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -931,7 +931,7 @@ +@@ -917,7 +917,7 @@ nncvpt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -853,7 +921,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs = *(int *)value; -@@ -1046,7 +1046,7 @@ +@@ -1031,7 +1031,7 @@ nncvpt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -862,7 +930,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, ncount, ndims); -@@ -1158,7 +1158,7 @@ +@@ -1142,7 +1142,7 @@ nncvptg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -871,7 +939,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1215,7 +1215,7 @@ +@@ -1199,7 +1199,7 @@ nncvptg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -880,7 +948,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1352,7 +1352,7 @@ +@@ -1335,7 +1335,7 @@ nncvgt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -889,7 +957,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs; -@@ -1495,7 +1495,7 @@ +@@ -1477,7 +1477,7 @@ nncvgt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -898,7 +966,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1629,7 +1629,7 @@ +@@ -1616,7 +1616,7 @@ nncvgtg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -907,7 +975,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1700,7 +1700,7 @@ +@@ -1687,7 +1687,7 @@ nncvgtg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -916,7 +984,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long iocount = dimprod (ncount, ndims); /* product of dimensions */ -@@ -1869,7 +1869,7 @@ +@@ -1853,7 +1853,7 @@ nncapt(cdfid, varid, attname, datatype, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -925,7 +993,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, attlen, 1); -@@ -2038,7 +2038,7 @@ +@@ -2018,7 +2018,7 @@ nncagt(cdfid, varid, attname, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -933,11 +1001,11 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-t3e.c work/mfhdf/fortran +#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 -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fortran/config/jackets-unicos.c ---- 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c 2005-02-09 04:04:19.000000000 +0100 -+++ work/mfhdf/fortran/config/jackets-unicos.c 2007-05-10 23:37:37.000000000 +0200 -@@ -39,7 +39,7 @@ + /*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-alpha.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c +--- HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c.ppc 2006-11-01 17:53:11.000000000 +0100 ++++ HDF4.2r2/mfhdf/fortran/config/jackets-alpha.c 2007-10-17 22:48:25.000000000 +0200 +@@ -34,7 +34,7 @@ struct ncfils { /* This will be a common block from Fortran */ double dd; @@ -946,7 +1014,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort int ll; #else long ll; -@@ -70,7 +70,7 @@ +@@ -65,7 +65,7 @@ struct ncfils { /* This will be a comm struct ncfils { /* This will be a common block from Fortran */ double dd; @@ -955,7 +1023,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort int ll; #else long ll; -@@ -436,7 +436,7 @@ +@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims) } #endif /* FORTRAN_HAS_NO_SHORT */ @@ -964,7 +1032,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort /* * Convert multi-dimensional array of NCLONGs stored in ints to packed * array of longs, in malloc'ed space. Returns pointer to longs or NULL -@@ -932,7 +932,7 @@ +@@ -917,7 +917,7 @@ nncvpt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -973,7 +1041,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs = *(int *)value; -@@ -1047,7 +1047,7 @@ +@@ -1031,7 +1031,7 @@ nncvpt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -982,7 +1050,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, ncount, ndims); -@@ -1159,7 +1159,7 @@ +@@ -1142,7 +1142,7 @@ nncvptg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -991,7 +1059,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1216,7 +1216,7 @@ +@@ -1199,7 +1199,7 @@ nncvptg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -1000,7 +1068,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itolg (value, ncount, nbasis, ndims); -@@ -1353,7 +1353,7 @@ +@@ -1335,7 +1335,7 @@ nncvgt1(cdfid, varid, indices, value, rc return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -1009,7 +1077,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort #ifdef HDF if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) { long longs; -@@ -1496,7 +1496,7 @@ +@@ -1477,7 +1477,7 @@ nncvgt(cdfid, varid, start, count, value return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -1018,7 +1086,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort #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 @@ +@@ -1618,7 +1618,7 @@ nncvgtg(cdfid, varid, start, count, stri tmpbasis = nctypelen(NC_LONG); else #endif @@ -1027,7 +1095,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort if (datatype == NC_LONG) tmpbasis = sizeof(int); else -@@ -1701,7 +1701,7 @@ +@@ -1689,7 +1689,7 @@ nncvgtg(cdfid, varid, start, count, stri return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -1036,7 +1104,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort #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 @@ +@@ -1855,7 +1855,7 @@ nncapt(cdfid, varid, attname, datatype, return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -1045,7 +1113,7 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort #ifdef HDF if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) { long *longs = itol (value, attlen, 1); -@@ -2039,7 +2039,7 @@ +@@ -2020,7 +2020,7 @@ nncagt(cdfid, varid, attname, value, rco return; } /* else */ #endif /* FORTRAN_HAS_NO_SHORT */ @@ -1053,99 +1121,59 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/fortran/config/jackets-unicos.c work/mfhdf/fort +#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 -Nru 4.2r1-hrepack-p4/mfhdf/libsrc/array.c work/mfhdf/libsrc/array.c ---- 4.2r1-hrepack-p4/mfhdf/libsrc/array.c 2003-12-10 22:15:09.000000000 +0100 -+++ work/mfhdf/libsrc/array.c 2007-05-10 22:59:12.000000000 +0200 -@@ -610,7 +610,7 @@ - case NC_LONG : - #if defined _CRAYMPP - xdr_NC_fnct = xdr_short; --#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff -Nru 4.2r1-hrepack-p4/mfhdf/libsrc/cdf.c work/mfhdf/libsrc/cdf.c ---- 4.2r1-hrepack-p4/mfhdf/libsrc/cdf.c 2005-10-10 19:14:03.000000000 +0200 -+++ work/mfhdf/libsrc/cdf.c 2007-05-10 22:59:52.000000000 +0200 -@@ -3557,7 +3557,7 @@ - alen /= 4 ; - #if defined _CRAYMPP - xdr_NC_fnct = xdr_short; --#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - xdr_NC_fnct = xdr_int ; - #else - xdr_NC_fnct = xdr_long ; -diff -Nru 4.2r1-hrepack-p4/mfhdf/libsrc/config/netcdf-linux.h work/mfhdf/libsrc/config/netcdf-linux.h ---- 4.2r1-hrepack-p4/mfhdf/libsrc/config/netcdf-linux.h 2004-11-22 19:57:20.000000000 +0100 -+++ work/mfhdf/libsrc/config/netcdf-linux.h 2007-05-10 23:30:05.000000000 +0200 -@@ -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__ -+#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 -Nru 4.2r1-hrepack-p4/mfhdf/libsrc/local_nc.h work/mfhdf/libsrc/local_nc.h ---- 4.2r1-hrepack-p4/mfhdf/libsrc/local_nc.h 2005-10-10 19:14:03.000000000 +0200 -+++ work/mfhdf/libsrc/local_nc.h 2007-05-10 23:02:00.000000000 +0200 -@@ -54,6 +54,15 @@ - #endif /* !macintosh */ - #endif /* NO_SYSTEM_XDR_INCLUDES */ -+#ifndef SWAP -+#ifdef __GLIBC__ -+#include -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+#define SWAP -+#endif -+#endif /* __GLIBC__ */ -+#endif /* !SWAP */ -+ - #include "netcdf.h" /* needed for defs of nc_type, ncvoid, ... */ +diff -up HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c.ppc HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c +--- HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c.ppc 2006-11-01 17:53:11.000000000 +0100 ++++ HDF4.2r2/mfhdf/fortran/config/jackets-fbsd.c 2007-10-17 22:48:25.000000000 +0200 +@@ -34,7 +34,7 @@ - /* ptr argument type in internal functions */ -diff -Nru 4.2r1-hrepack-p4/mfhdf/libsrc/netcdf.h.in work/mfhdf/libsrc/netcdf.h.in ---- 4.2r1-hrepack-p4/mfhdf/libsrc/netcdf.h.in 2004-11-22 19:57:08.000000000 +0100 -+++ work/mfhdf/libsrc/netcdf.h.in 2007-05-10 23:03:47.000000000 +0200 -@@ -295,7 +295,7 @@ - */ - #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 -Nru 4.2r1-hrepack-p4/mfhdf/libsrc/putget.c work/mfhdf/libsrc/putget.c ---- 4.2r1-hrepack-p4/mfhdf/libsrc/putget.c 2005-10-10 19:14:03.000000000 +0200 -+++ work/mfhdf/libsrc/putget.c 2007-05-10 23:28:58.000000000 +0200 -@@ -582,7 +582,7 @@ - case NC_LONG : - #if defined _CRAYMPP - return( xdr_short(xdrs, (nclong *)values) ) ; --#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - return( xdr_int(xdrs, (nclong *)values) ) ; + 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 - return( xdr_long(xdrs, (nclong *)values) ) ; -@@ -1884,7 +1884,7 @@ - case NC_LONG : - #if defined _CRAYMPP - xdr_NC_fnct = xdr_short; --#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - xdr_NC_fnct = xdr_int ; + long ll; +@@ -65,7 +65,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 - xdr_NC_fnct = xdr_long ; -diff -Nru 4.2r1-hrepack-p4/mfhdf/ncgen/ncgen.l work/mfhdf/ncgen/ncgen.l ---- 4.2r1-hrepack-p4/mfhdf/ncgen/ncgen.l 2003-12-10 22:15:27.000000000 +0100 -+++ work/mfhdf/ncgen/ncgen.l 2007-05-10 23:02:35.000000000 +0200 -@@ -134,7 +134,7 @@ + long ll; +@@ -430,7 +430,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 + * array of longs, in malloc'ed space. Returns pointer to longs or NULL +@@ -1083,7 +1083,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); + else +@@ -1437,7 +1437,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); + else +diff -up HDF4.2r2/mfhdf/ncgen/ncgen.l.ppc HDF4.2r2/mfhdf/ncgen/ncgen.l +--- HDF4.2r2/mfhdf/ncgen/ncgen.l.ppc 2003-12-10 22:15:54.000000000 +0100 ++++ HDF4.2r2/mfhdf/ncgen/ncgen.l 2007-10-17 22:48:25.000000000 +0200 +@@ -134,7 +134,7 @@ FloatInf|Infinity|Inf { /* float miss yyerror(errstr); } @@ -1154,154 +1182,3 @@ diff -Nru 4.2r1-hrepack-p4/mfhdf/ncgen/ncgen.l work/mfhdf/ncgen/ncgen.l if (dd < INT_MIN || dd > INT_MAX) #else #if defined (_CRAYMPP) ---- 4.2r1-hrepack-p4/mfhdf/libsrc/xdrposix.c 2005-10-10 19:14:04.000000000 +0200 -+++ work/mfhdf/libsrc/xdrposix.c 2007-05-11 00:47:40.000000000 +0200 -@@ -284,7 +284,7 @@ - - static bool_t xdrposix_getlong(); - static bool_t xdrposix_putlong(); --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - static bool_t xdrposix_getint(); - static bool_t xdrposix_putint(); - #endif -@@ -622,7 +622,7 @@ - return (NULL); - } - --#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ -+#if (_MIPS_SZLONG == 64) || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__ - - static bool_t - xdrposix_getint(xdrs, lp) ---- 4.2r1-hrepack-p4/mfhdf/libsrc/hdftest.c 2007-05-11 10:42:20.000000000 +0200 -+++ work/mfhdf/libsrc/hdftest.c 2007-05-11 10:40:44.000000000 +0200 -@@ -1627,6 +1627,9 @@ - const char *basename = "test1.nc"; - char *srcdir = getenv("srcdir"); - -+ /* disable test of read we have buggy routines here */ -+ return 0; -+ - /* Generate the correct name for the test file, by prepending the source path */ - if (srcdir && ((strlen(srcdir) + strlen(basename) + 1) < sizeof(testfile))) { - strcpy(testfile, srcdir); ---- 4.2r1-hrepack-p4/hdf/src/hdfi.h 2005-01-25 04:36:44.000000000 +0100 -+++ work/hdf/src/hdfi.h 2007-05-11 11:14:32.000000000 +0200 -@@ -72,6 +72,8 @@ - #define DFMT_CRAYMPP 0x1171 - #define DFMT_IA64 0x4441 - #define DFMT_LINUX64 0x4441 -+#define DFMT_LINUXPPC 0x1111 -+#define DFMT_PPC64 0x8881 - - /* I/O library constants */ - #define UNIXUNBUFIO 1 -@@ -1326,6 +1328,107 @@ - - #endif /*Linux 64 */ - -+/* Linux PPC */ -+#if defined __powerpc__ && !defined __powerpc64__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_LINUXPPC -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+ -+#ifdef __GNUC__ -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+#endif -+ -+#endif /*Linux PPC */ -+ -+/* Linux PPC64 */ -+#if defined __powerpc64__ -+ -+#ifdef GOT_MACHINE -+If you get an error on this line more than one machine type has been defined. -+Please check your Makefile. -+#endif -+#define GOT_MACHINE -+ -+#include /* for unbuffered i/o stuff */ -+#include -+#define DF_MT DFMT_PPC64 -+typedef void VOID; -+typedef void *VOIDP; -+typedef char *_fcd; -+typedef char char8; -+typedef unsigned char uchar8; -+typedef char int8; -+typedef unsigned char uint8; -+typedef short int int16; -+typedef unsigned short int uint16; -+typedef int int32; -+typedef unsigned int uint32; -+typedef int intn; -+typedef unsigned int uintn; -+typedef int intf; /* size of INTEGERs in Fortran compiler */ -+typedef float float32; -+typedef double float64; -+typedef long hdf_pint_t; /* an integer the same size as a pointer */ -+#define FNAME_POST_UNDERSCORE -+#define _fcdtocp(desc) (desc) -+#ifdef HAVE_FMPOOL -+#define FILELIB PAGEBUFIO /* enable page buffering */ -+#else -+#define FILELIB UNIXBUFIO -+#endif -+ -+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */ -+ -+/* Determine the memory manager we are going to use. Valid values are: */ -+/* MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS. See the JPEG docs for details on */ -+/* what each does */ -+#define JMEMSYS MEM_ANSI -+ -+#ifdef __GNUC__ -+#define HAVE_STDC -+#define INCLUDES_ARE_ANSI -+#endif -+#endif /*Linux PPC64 */ -+ - /*#ifndef GOT_MACHINE - No machine type has been defined. Your Makefile needs to have someing like - -DSUN or -DUNICOS in order for the HDF internal structures to be defined diff --git a/hdf.spec b/hdf.spec index ba728f4..0da0f84 100644 --- a/hdf.spec +++ b/hdf.spec @@ -1,16 +1,15 @@ Name: hdf -Version: 4.2r1 -Release: 15%{?dist} +Version: 4.2r2 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD Group: System Environment/Libraries URL: http://hdf.ncsa.uiuc.edu/hdf4.html -#Source0: ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz -Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/4.2r1-hrepack-p4.tar.gz +Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/HDF%{version}.tar.gz Patch0: hdf-4.2r1p4-maxavailfiles.patch -Patch1: hdf-4.2r1-ppc.patch +Patch1: hdf-4.2r2-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf flex byacc libjpeg-devel zlib-devel +BuildRequires: flex byacc libjpeg-devel zlib-devel BuildRequires: gcc-gfortran @@ -35,23 +34,25 @@ HDF development headers and libraries. %prep -#%setup -q -n HDF%{version} -%setup -q -n 4.2r1-hrepack-p4 +%setup -q -n HDF%{version} %patch -p1 -b .maxavailfiles %patch1 -p1 -b .ppc +chmod a-x *hdf/*/*.c hdf/*/*.h + %build -autoconf -export CFLAGS="$RPM_OPT_FLAGS -fPIC -DHAVE_NETCDF" -%configure F77=gfortran FFLAGS=-ffixed-line-length-none --disable-production +rm config/*linux-gnu +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +export FFLAGS="$RPM_OPT_FLAGS -ffixed-line-length-none" +%configure F77=gfortran --disable-production \ + --includedir=%{_includedir}/%{name} --libdir=%{_libdir}/%{name} make %install rm -rf $RPM_BUILD_ROOT -%makeinstall includedir=${RPM_BUILD_ROOT}%{_includedir}/%{name} \ - libdir=$RPM_BUILD_ROOT%{_libdir}/%{name} +make install DESTDIR=$RPM_BUILD_ROOT #Don't conflict with netcdf rm $RPM_BUILD_ROOT%{_bindir}/nc* $RPM_BUILD_ROOT%{_mandir}/man1/nc* @@ -77,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 17 2007 Patrice Dumas 4.2r2-1 +- update to 4.2r2 + * Fri Aug 24 2007 Orion Poplawski 4.2r1-15 - Update license tag to BSD - Rebuild for BuildID