--- uts/common/fs/zfs/sys/vdev_impl.h	2006/06/08 23:43:18
+++ uts/common/fs/zfs/sys/vdev_impl.h	2006/08/15 20:33:54
@@ -203,7 +203,7 @@
 	offsetof(vdev_label_t, vl_uberblock[(n) << VDEV_UBERBLOCK_SHIFT(vd)])
 #define	VDEV_UBERBLOCK_SIZE(vd)		(1ULL << VDEV_UBERBLOCK_SHIFT(vd))
 
-#define	VDEV_BOOT_MAGIC		0x2f5b007b10c	/* ZFS boot block	*/
+#define	VDEV_BOOT_MAGIC		0x2f5b007b10cULL/* ZFS boot block	*/
 #define	VDEV_BOOT_VERSION	1		/* version number	*/
 
 typedef struct vdev_boot_header {
--- uts/common/fs/zfs/sys/zap_impl.h	2006/04/09 09:30:01
+++ uts/common/fs/zfs/sys/zap_impl.h	2006/08/15 20:33:54
@@ -38,7 +38,7 @@
 
 extern int fzap_default_block_shift;
 
-#define	ZAP_MAGIC 0x2F52AB2AB
+#define	ZAP_MAGIC 0x2F52AB2ABULL
 
 #define	FZAP_BLOCK_SHIFT(zap)	((zap)->zap_f.zap_block_shift)
 
--- uts/common/fs/zfs/zap_leaf.c	2006/04/09 09:30:01
+++ uts/common/fs/zfs/zap_leaf.c	2006/08/15 20:33:54
@@ -94,7 +94,7 @@
 		return (*(uint64_t *)addr);
 	}
 	ASSERT(!"bad int len");
-	return (0xFEEDFACEDEADBEEF);
+	return (0xFEEDFACEDEADBEEFULL);
 }
 
 void