------------------------------------------------------------ revno: 13983 revision-id: squid3@treenet.co.nz-20160215071414-pqrp5ww5y433z1ek parent: squid3@treenet.co.nz-20160215062405-u699atob39tf7uf5 committer: Amos Jeffries branch nick: 3.5 timestamp: Mon 2016-02-15 20:14:14 +1300 message: Fix compile error in CPU affinity struct cpu_set_t may be defined (eg on Hurd) even if the CPU affinity API is not fully existing, or a non-working stub. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20160215071414-pqrp5ww5y433z1ek # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: b9a442695d95d4934ea814ba8f34fc739b0e0410 # timestamp: 2016-02-15 07:41:09 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20160215062405-\ # u699atob39tf7uf5 # # Begin patch === modified file 'compat/cpu.h' --- compat/cpu.h 2016-01-01 00:14:27 +0000 +++ compat/cpu.h 2016-02-15 07:14:14 +0000 @@ -18,9 +18,11 @@ #if !HAVE_CPU_AFFINITY /* failing replacements to minimize the number of if-HAVE_CPU_AFFINITYs */ +#if !defined(__cpu_set_t_defined) typedef struct { int bits; } cpu_set_t; +#endif inline int sched_setaffinity(int, size_t, cpu_set_t *) { return ENOTSUP; } inline int sched_getaffinity(int, size_t, cpu_set_t *) { return ENOTSUP; } #endif /* HAVE_CPU_AFFINITY */