Merge pull request Unidata#2850 from opoplawski/types

Fix some variable types. Resolves Unidata#2849
gsjaardema · Jan 30, 2024 · abc626c · abc626c
2 parents 41166da + 07134b9
commit abc626c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libhdf4/hdf4file.c b/libhdf4/hdf4file.c
@@ -485,7 +485,7 @@ hdf4_read_var(NC_FILE_INFO_T *h5, int v)
     int32 sdsid;
     int contiguous;
     int d, a;
-    int flag;
+    int32 flag;
     char name[NC_MAX_HDF4_NAME+1];
     int xtype;
     char type_name[NC_MAX_NAME + 1];

diff --git a/ncgen/ncgen.h b/ncgen/ncgen.h
@@ -173,7 +173,7 @@ typedef struct Typeinfo {
 	int             hasvlen;  /* 1 => this type contains a vlen*/
 	nc_type         typecode;
         unsigned long   offset;   /* fields in struct*/
-        unsigned long   alignment;/* fields in struct*/
+        size_t          alignment;/* fields in struct*/
         NCConstant*     econst;   /* for enum values*/
         Dimset          dimset;     /* for NC_VAR/NC_FIELD/NC_ATT*/
         size_t   size;     /* for opaque, compound, etc.*/