merge
diff --git a/src/libdiskfs/hfs.h b/src/libdiskfs/hfs.h
index a8a7943..662c338 100644
--- a/src/libdiskfs/hfs.h
+++ b/src/libdiskfs/hfs.h
@@ -135,8 +135,8 @@
 			/* in memory only */
 			int	nhdr;		/* 0 or Adlen */
 			Fork	*fork;		/* dfork or rfork */
-		};
-	};
+		} f;
+	} u;
 };
 
 struct Tree
@@ -200,7 +200,7 @@
 	union{
 		Name	name;
 		uchar	*b;		/* not yet decoded */
-	};
+	} u;
 };
 
 struct Hfs