casa-mp-base

--- src/GDapi.c.orig    2014-02-07 01:10:29.000000000 +0900

+++ src/GDapi.c 2017-10-01 16:15:34.000000000 +0900

@@ -88,8 +88,8 @@

 int HE5_szip_can_encode(void );

 void HE5_GDgetEastAndNorthFiles(char *eastFile, char *northFile);

-static herr_t HE5_GDflddiminfo(int gridID, char *fieldname, int *rank,  hsize_t dims[], hsize_t maxdims[]);

-static herr_t HE5_GDupdatedim(int gridhID,  char *dimname, hsize_t dim);

+static herr_t HE5_GDflddiminfo(hid_t gridID, char *fieldname, int *rank,  hsize_t dims[], hsize_t maxdims[]);

+static herr_t HE5_GDupdatedim(hid_t gridhID,  char *dimname, hsize_t dim);

 /* FORTRAN wrappers */

 /* ================ */

@@ -17263,7 +17263,7 @@

 |  7/12/00  A.Muslimov    Unmasked hdf5 data types.                           |

 |  END_PROLOG                                                                 |

 -----------------------------------------------------------------------------*/

-hid_t

+herr_t

 HE5_GDdeftimeperiod(hid_t gridID, hid_t periodID, double starttime, double stoptime)

 {

   double         timerange[2]={0.,0.};/* Range of periods */

@@ -19990,7 +19990,7 @@

 |  END_PROLOG                                                                 |

 -----------------------------------------------------------------------------*/

 static int

-HE5_GDfldnameinfo(int gridID, const char *fieldname, char *actualname)

+HE5_GDfldnameinfo(hid_t gridID, const char *fieldname, char *actualname)

 {

   int         nameFlag       = FAIL;/* Return value of flag            */

   int         length         = 0;   /* String length                   */

@@ -27698,7 +27698,7 @@

 |  END_PROLOG                                                                 |

 -----------------------------------------------------------------------------*/

 herr_t

-HE5_GDflddiminfo(int GridID, char *fieldname, int *rank,  hsize_t dims[], hsize_t maxdims[])

+HE5_GDflddiminfo(hid_t GridID, char *fieldname, int *rank,  hsize_t dims[], hsize_t maxdims[])

 {

   herr_t      status         = FAIL;      /* return status             */

   hid_t       gdID           = FAIL;      /* HDF5 type grid ID         */