X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=fwcutter%2Ffwcutter.h;h=c6d3c3fc4a5ea3e2a0c336664f99a26f6b61ce92;hb=c151c2f2d6f9c660294a25dd7e2d7bd01b5e0a6d;hp=ac2df63ceb217ac47615aac77951f249d03cf66c;hpb=0ed1d91f9f40755769c79de5a2aff896cf0b2d0e;p=b43-tools.git

diff --git a/fwcutter/fwcutter.h b/fwcutter/fwcutter.h
index ac2df63..c6d3c3f 100644
--- a/fwcutter/fwcutter.h
+++ b/fwcutter/fwcutter.h
@@ -9,10 +9,13 @@
 #define fwcutter_stringify(x)	fwcutter_stringify_1(x)
 #define FWCUTTER_VERSION	fwcutter_stringify(FWCUTTER_VERSION_)
 
+#undef ARRAY_SIZE
+#define ARRAY_SIZE(array)	(sizeof(array) / sizeof((array)[0]))
+
 typedef uint16_t be16_t; /* Big-endian 16bit */
 typedef uint32_t be32_t; /* Big-endian 32bit */
 
-#ifdef __DragonFly__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define bswap_16	bswap16
 #define bswap_32	bswap32
 #endif
@@ -65,7 +68,6 @@ struct extract {
 
 struct file {
 	const char *name;
-	const char *id;
 	const char *ucode_version;
 	const char *md5;
 	const struct extract *extract;