From: Alex Rousskov Date: Thu, 11 Aug 2016 20:49:22 +0000 (-0600) Subject: Cleanup cleanup: parseNamedIntList needs #if protections since r14789. X-Git-Tag: SQUID_4_0_14~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab7e1298e1ddecf10b1740329056eb271da262b0;p=thirdparty%2Fsquid.git Cleanup cleanup: parseNamedIntList needs #if protections since r14789. There are design problems with r14789, but I am only addressing the build failure. --- diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 1952fbcc89..2a860be869 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -230,8 +230,6 @@ static void free_ftp_epsv(acl_access **ftp_epsv); static void parse_b_size_t(size_t * var); static void parse_b_int64_t(int64_t * var); -static bool parseNamedIntList(const char *data, const String &name, std::vector &list); - static void parse_CpuAffinityMap(CpuAffinityMap **const cpuAffinityMap); static void dump_CpuAffinityMap(StoreEntry *const entry, const char *const name, const CpuAffinityMap *const cpuAffinityMap); static void free_CpuAffinityMap(CpuAffinityMap **const cpuAffinityMap); @@ -4193,6 +4191,7 @@ free_access_log(CustomLog ** definitions) } } +#if HAVE_CPU_AFFINITY /* until somebody else needs this general code */ /// parses list of integers form name=N1,N2,N3,... static bool parseNamedIntList(const char *data, const String &name, std::vector &list) @@ -4213,6 +4212,7 @@ parseNamedIntList(const char *data, const String &name, std::vector &list) } return data && *data == '\0'; } +#endif static void parse_CpuAffinityMap(CpuAffinityMap **const cpuAffinityMap)