]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Fix conflicting types of virInitctlSetRunLevel
authorJán Tomko <jtomko@redhat.com>
Tue, 18 Feb 2014 14:01:32 +0000 (15:01 +0100)
committerEric Blake <eblake@redhat.com>
Tue, 18 Feb 2014 23:44:17 +0000 (16:44 -0700)
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)

src/util/virinitctl.c

index 4deeb197d2c3a4f063f52a798043f174642ace44..53fa9c043325547525376a2e143ed06dff524a1e 100644 (file)
@@ -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;