2 files changed, 3 insertions, 3 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 55b56d1..7b11b93 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -572,9 +572,9 @@ int do_copy_objects(hid_t fidin,
     if (H5Gget_objinfo(fidin,travt->objs[i].name,FALSE,&statbuf)<0)
      goto error;
 
-    targbuf = malloc(statbuf.u.slink.linklen);
+    targbuf = malloc(statbuf.linklen);
 
-    if (H5Gget_linkval(fidin,travt->objs[i].name,statbuf.u.slink.linklen,targbuf)<0)
+    if (H5Gget_linkval(fidin,travt->objs[i].name,statbuf.linklen,targbuf)<0)
      goto error;
 
     if (H5Glink(fidout,
diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c
index 83b1c13..6e3156b 100644
--- a/tools/h5repack/h5repack_refs.c
+++ b/tools/h5repack/h5repack_refs.c
@@ -787,7 +787,7 @@ static const char* MapIdToName(hid_t refobj_id,
     return NULL;
    if (H5Dclose(id)<0)
     return NULL;
-   if (refstat.fileno==objstat.fileno && refstat.u.obj.objno==objstat.u.obj.objno)
+   if (!HDmemcmp(&refstat.fileno, &objstat.fileno, sizeof(refstat.fileno)) && !HDmemcmp(&refstat.objno, &objstat.objno, sizeof(refstat.objno)))
    {
     H5Fclose(fid);
     return travt->objs[i].name;