Date: Thu, 26 Mar 2020 20:01:00 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529211 - in head/sysutils/xen-guest-tools: . files Message-ID: <202003262001.02QK10cr001713@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Thu Mar 26 20:01:00 2020 New Revision: 529211 URL: https://svnweb.freebsd.org/changeset/ports/529211 Log: - fix build with llvm10 Submitted by: kevans Added: head/sysutils/xen-guest-tools/files/patch-fsys_zfs.h (contents, props changed) Modified: head/sysutils/xen-guest-tools/Makefile Modified: head/sysutils/xen-guest-tools/Makefile ============================================================================== --- head/sysutils/xen-guest-tools/Makefile Thu Mar 26 19:52:22 2020 (r529210) +++ head/sysutils/xen-guest-tools/Makefile Thu Mar 26 20:01:00 2020 (r529211) @@ -3,7 +3,7 @@ PORTNAME= xen-guest-tools PORTVERSION= 4.13.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://downloads.xenproject.org/release/xen/${PORTVERSION}/ DISTNAME= xen-${PORTVERSION} Added: head/sysutils/xen-guest-tools/files/patch-fsys_zfs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xen-guest-tools/files/patch-fsys_zfs.h Thu Mar 26 20:01:00 2020 (r529211) @@ -0,0 +1,20 @@ +--- tools/libfsimage/zfs/fsys_zfs.h.orig 2020-03-26 16:41:12 UTC ++++ tools/libfsimage/zfs/fsys_zfs.h +@@ -71,7 +71,7 @@ typedef unsigned int size_t; + * Can only be used in functions returning non-0 for failure. + */ + #define VERIFY_DN_TYPE(dnp, type) \ +- if (type && (dnp)->dn_type != type) { \ ++ if (type != DMU_OT_NONE && (dnp)->dn_type != type) { \ + return (ERR_FSYS_CORRUPT); \ + } + +@@ -80,7 +80,7 @@ typedef unsigned int size_t; + * Can only be used in functions returning 0 for failure. + */ + #define VERIFY_OS_TYPE(osp, type) \ +- if (type && (osp)->os_type != type) { \ ++ if (type != DMU_OST_NONE && (osp)->os_type != type) { \ + errnum = ERR_FSYS_CORRUPT; \ + return (0); \ + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003262001.02QK10cr001713>