On 01/31/2017 12:43 PM, Michael S. Tsirkin wrote: > QEMU_BUILD_BUG_ON uses a typedef in order to be safe > to use outside functions, but sometimes it's useful > to have a version that can be used within an expression. > Following what Linux does, introduce QEMU_BUILD_BUG_ON_ZERO > that return zero after checking condition at build time. > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > Reviewed-by: Eric Blake <ebl...@redhat.com> > Reviewed-by: Markus Armbruster <arm...@redhat.com> > --- > include/qemu/compiler.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h > index e0ce9ff..462ade2 100644 > --- a/include/qemu/compiler.h > +++ b/include/qemu/compiler.h > @@ -100,6 +100,9 @@ > #define QEMU_BUILD_BUG_ON_ZERO(x) (sizeof(QEMU_BUILD_BUG_ON_STRUCT(x)) - \ > sizeof(QEMU_BUILD_BUG_ON_STRUCT(x))) > > +#define QEMU_BUILD_BUG_ON_ZERO(x) (sizeof(QEMU_BUILD_BUG_ON_STRUCT(x)) - \ > + sizeof(QEMU_BUILD_BUG_ON_STRUCT(x))) > +
Umm, we don't want this defined twice. I think you have a rebase mistake, where 6/23 is bogus (it repeats the commit message of 4/23 and the contents of 7/23). -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
