From 6381c1c130907ec86ccbc12b4d9a38c3fbaf472d Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 2 May 2013 15:46:19 -0600 Subject: [PATCH] build: fix mingw build of virprocess.c 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 (cherry picked from commit 05f79a3894a04b305c18993bedf117c6b6e41d52) --- src/util/virprocess.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index fb818059f8..86d872e563 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -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