From 23ea0a45d0454706c1ddc47e1a6b0aad8543da30 Mon Sep 17 00:00:00 2001 From: "J.C. Jones" Date: Tue, 11 Feb 2020 14:06:19 -0700 Subject: [PATCH] =?UTF-8?q?Bug=201614786=20-=20Fixup=20for=20=E2=80=98getF?= =?UTF-8?q?IPSEnv=E2=80=99=20being=20unused=20r=3Dkjacobs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a regression from Bug 1582169 ../../lib/sysinit/nsssysinit.c:153:1: error: ‘getFIPSEnv’ defined but not used [-Werror=unused-function] --HG-- extra : amend_source : b1dcbe0ce8eab20cc5cc46c5bd0a88908dceb8bb --- lib/sysinit/nsssysinit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/sysinit/nsssysinit.c b/lib/sysinit/nsssysinit.c index 8eb22eff0f..8793bf5593 100644 --- a/lib/sysinit/nsssysinit.c +++ b/lib/sysinit/nsssysinit.c @@ -149,6 +149,7 @@ userCanModifySystemDB() return (access(NSS_DEFAULT_SYSTEM, W_OK) == 0); } +#ifndef NSS_FIPS_DISABLED static PRBool getFIPSEnv(void) { @@ -164,6 +165,7 @@ getFIPSEnv(void) } return PR_FALSE; } +#endif /* NSS_FIPS_DISABLED */ static PRBool getFIPSMode(void) @@ -189,7 +191,7 @@ getFIPSMode(void) return PR_TRUE; #else return PR_FALSE; -#endif +#endif /* NSS_FIPS_DISABLED */ } #define NSS_DEFAULT_FLAGS "flags=readonly"