[libvirt] [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. --- Pushed under build breaker rule. src/util/virnetlink.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 82154de..b1a1750 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 <netlink/msg.h> -# undef inline +# ifdef HAVE_LIBNL1 +# undef inline +# endif # else -- 1.7.8.6

On 08/28/2012 03:10 AM, Michal Privoznik wrote:
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. ---
Pushed under build breaker rule.
Thanks. I thought it would work in both cases, but I obviously failed to correctly test libnl3. Your patch is correct. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake
-
Michal Privoznik