From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 18 Feb 2014 14:01:32 +0000 (+0100)
Subject: Fix conflicting types of virInitctlSetRunLevel
X-Git-Tag: v1.1.3.5~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb90e48b7ad4e5f1238481ded82125b109a06460;p=thirdparty%2Flibvirt.git

Fix conflicting types of virInitctlSetRunLevel

aebbcdd didn't change the non-linux definition of the function,
breaking the build on FreeBSD:

../../src/util/virinitctl.c:164: error: conflicting types for
'virInitctlSetRunLevel'
../../src/util/virinitctl.h:40: error: previous declaration of
'virInitctlSetRunLevel' was here

(cherry picked from commit adc8b2afbb4683cf7b110c7c6a1067339b472c1c)
---

diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index 4deeb197d2..53fa9c0433 100644
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -159,8 +159,7 @@ cleanup:
     return ret;
 }
 #else
-int virInitctlSetRunLevel(virInitctlRunLevel level ATTRIBUTE_UNUSED,
-                          const char *vroot ATTRIBUTE_UNUSED)
+int virInitctlSetRunLevel(virInitctlRunLevel level ATTRIBUTE_UNUSED)
 {
    virReportError(VIR_ERR_NO_SUPPORT, "%s", __FUNCTION__);
    return -1;