]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
build: fix mingw build of virprocess.c
authorEric Blake <eblake@redhat.com>
Thu, 2 May 2013 21:46:19 +0000 (15:46 -0600)
committerEric Blake <eblake@redhat.com>
Mon, 6 May 2013 20:17:35 +0000 (14:17 -0600)
Commit 776d49f4 added a static function that is only called
conditionally; leading to this compile error on mingw:

  CC       libvirt_util_la-virprocess.lo
../../src/util/virprocess.c:624:26: error: 'struct rlimit' declared inside parameter list [-Werror]
../../src/util/virprocess.c:624:26: error: its scope is only this definition or declaration, which is probably not what you want [-Werror]
../../src/util/virprocess.c:622:1: error: 'virProcessPrLimit' defined but not used [-Werror=unused-function]

* src/util/virprocess.c (virProcessPrLimit): Only declare
virProcessPrLimit when used.

Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 05f79a3894a04b305c18993bedf117c6b6e41d52)

src/util/virprocess.c

index fb818059f8bb1cedf91bcf1eeb09bc742433caed..86d872e563f2b0217d6f35bce637c7757e88c222 100644 (file)
@@ -616,7 +616,7 @@ virProcessPrLimit(pid_t pid, int resource, struct rlimit *rlim)
 {
     return prlimit(pid, resource, rlim, NULL);
 }
-#else /* ! HAVE_PRLIMIT */
+#elif HAVE_SETRLIMIT
 static int
 virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED,
                   int resource ATTRIBUTE_UNUSED,
@@ -625,7 +625,7 @@ virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED,
     errno = ENOSYS;
     return -1;
 }
-#endif /* ! HAVE_PRLIMIT */
+#endif
 
 #if HAVE_SETRLIMIT && defined(RLIMIT_MEMLOCK)
 int