--- src/SWapi.c.orig	2014-02-07 01:10:30.000000000 +0900
+++ src/SWapi.c	2017-10-01 16:24:30.000000000 +0900
@@ -90,12 +90,12 @@
 static int 
 HE5_SWfldnameinfo(hid_t swathID, char *fieldname, char *fldactualname);
 static herr_t
-HE5_SWupdatedim(int swathID,  char *dimname, hsize_t dim);
+HE5_SWupdatedim(hid_t swathID,  char *dimname, hsize_t dim);
 static herr_t
 HE5_SWllmapedidxinfo(hid_t swathID, char *object, long *index0, long *index1);
 
 static herr_t
-HE5_SWflddiminfo(int SwathID, char *fieldname, int *rank,  hsize_t dims[], hsize_t maxdims[]);
+HE5_SWflddiminfo(hid_t SwathID, char *fieldname, int *rank,  hsize_t dims[], hsize_t maxdims[]);
 
 
 /* CUSTOM MEMORY MANAGEMENT ROUTINES */
@@ -4087,7 +4087,7 @@
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 static int
-HE5_SWfldnameinfo(int swathID, char *fieldname, char *actualname)
+HE5_SWfldnameinfo(hid_t swathID, char *fieldname, char *actualname)
 {
   int         nameFlag       = FAIL;/* Return value of flag            */
   int         length         = 0;   /* String length                   */
@@ -4284,7 +4284,7 @@
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 static herr_t
-HE5_SWfinfo(int swathID, char *fieldtype, char *fieldname, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
+HE5_SWfinfo(hid_t swathID, char *fieldtype, char *fieldname, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
 {
   herr_t     status         = FAIL;/* routine return status variable                  */
   herr_t     statmeta       = FAIL;/* EHgetmetavalue return status                    */
@@ -31317,7 +31317,7 @@
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 herr_t
-HE5_SWflddiminfo(int SwathID, char *fieldname, int *rank,  hsize_t dims[], hsize_t maxdims[])
+HE5_SWflddiminfo(hid_t SwathID, char *fieldname, int *rank,  hsize_t dims[], hsize_t maxdims[])
 {
   herr_t      status         = FAIL;      /* return status             */
   hid_t       swID           = FAIL;      /* HDF5 type swath ID        */