From: Eric Bollengier Date: Wed, 22 Dec 2021 13:26:23 +0000 (+0100) Subject: Fix compilation X-Git-Tag: Beta-15.0.0~702 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f11696dd0d6e3284918030117130b0a3f94abc72;p=thirdparty%2Fbacula.git Fix compilation Apparently, "linux" is a variable/object that already exists --- diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c index 5b71cdee2..24871722c 100644 --- a/bacula/src/stored/stored.c +++ b/bacula/src/stored/stored.c @@ -160,11 +160,11 @@ bail_out: static bool get_needed_caps() { /* Determine why we fail here */ - bool linux, libcap; + bool islinux, libcap; #if defined(HAVE_LINUX_OS) - linux = true; + islinux = true; #else - linux = false; + islinux = false; #endif // HAVE_LINUX_OS #if defined(HAVE_LIBCAP) @@ -173,7 +173,7 @@ static bool get_needed_caps() libcap = false; #endif // HAVE_LIBCAP - Dmsg2(90, "Returning from mocked get_needed_caps(), linux: %d libcap: %d\n", + Dmsg2(90, "Returning from mocked get_needed_caps(), islinux: %d libcap: %d\n", linux, libcap); return false; }