From 500c24688942cb5bf2eb1d7d238531e86788eb29 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 28 Aug 2012 12:01:50 +0200 Subject: [PATCH] build: define 'inline' iff HAVE_LIBNL1 Previous commit 0b4b53bb80 defined 'inline' to prevent broken build on systems with libnl1 headers. However, it broke build on systems with libnl3 headers. Therefore we must make that fix conditional. --- src/util/virnetlink.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 82154de08a..b1a1750e1b 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -28,9 +28,13 @@ /* Work around a bug where older libnl-1 headers expected older gcc * semantics of 'extern inline' that conflict with C99 semantics. */ -# define inline +# ifdef HAVE_LIBNL1 +# define inline +# endif # include -# undef inline +# ifdef HAVE_LIBNL1 +# undef inline +# endif # else