From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 18 Apr 2018 07:37:09 +0000 (+0200)
Subject: virmocklibxl.c: Fix include of virfile.h
X-Git-Tag: v4.3.0-rc1~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c36a59b020fa4f938a05a400f727a1c6d2c0d48;p=thirdparty%2Flibvirt.git

virmocklibxl.c: Fix include of virfile.h

Firstly, this isn't supposed to be in angle brackets because it's
not a system header file (not that gcc distinguishes these two,
it's just guide for us developers).

Secondly, no need to use util/ path prefix because CFLAGS already
contain -I$(srcdir)/util.

The include is needed because virmocklibxl is mocking
virFileMakePath() and even when VIR_MOCK_IMPL_RET_ARGS() does
forward declaration to shut up compiler we need real
virFileMakePath() declaration so that when it changes compiler
catches mismatching declarations.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/tests/virmocklibxl.c b/tests/virmocklibxl.c
index 50ae25810f..546c6d6a43 100644
--- a/tests/virmocklibxl.c
+++ b/tests/virmocklibxl.c
@@ -27,11 +27,12 @@
 # include <sys/stat.h>
 # include <unistd.h>
 # include <libxl.h>
-# include <util/virfile.h>
 # include <xenstore.h>
 # include <xenctrl.h>
 # include <sys/socket.h>
 
+# include "virfile.h"
+
 VIR_MOCK_IMPL_RET_VOID(xs_daemon_open,
                        struct xs_handle *)
 {