__le64/uint64_t may give the compiler a headache

vasi · Jun 4, 2014 · ebb15ec · ebb15ec
1 parent ae7fcb7
commit ebb15ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/gen_swap.sh b/gen_swap.sh
@@ -27,7 +27,7 @@ ${SED:-sed} -n '
 /^struct squashfs_/,/^}/{
 	s/^struct \(squashfs_\([^[:space:]]*\)\).*/void sqfs_swapin_\2(struct \1 *s){/p;t decl
 	s/};/}/p;t
-	s/^[[:space:]]*__le\([[:digit:]]*\)[[:space:]]*\([a-z_]*\);$/sqfs_swapin\1(\&s->\2);/p
+	s/^[[:space:]]*__le\([[:digit:]]*\)[[:space:]]*\([a-z_]*\);$/sqfs_swapin\1_internal(\&s->\2);/p
 }
 d
 :decl

diff --git a/swap.c b/swap.c
@@ -41,6 +41,10 @@ SWAP(32)
 SWAP(64)
 #undef SWAP
 
+void sqfs_swapin16_internal(__le16 *v) { sqfs_swapin16((uint16_t*)v); }
+void sqfs_swapin32_internal(__le32 *v) { sqfs_swapin32((uint32_t*)v); }
+void sqfs_swapin64_internal(__le64 *v) { sqfs_swapin64((uint64_t*)v); }
+
 void sqfs_swap16(uint16_t *n) {
 	*n = (*n >> 8) + (*n << 8);
 }