Hi Brian,
Brian Inglis wrote:
On 2023-07-03 00:17, Mark Geisert wrote:
Three modifications to include/sys/cpuset.h:
* Change C++-style comments to C-style also supported by C++
* Change "inline" to "__inline" on code lines
* Don't declare loop variables on for-loop init clauses
Tested by first reproducing the reported issue with home-grown test
programs by compiling with gcc option "-std=c89", then compiling again
using the modified <sys/cpuset.h>. Other "-std=" options tested too.
Addresses: https://cygwin.com/pipermail/cygwin-patches/2023q3/012308.html
Fixes: 315e5fbd99ec ("Cygwin: Fix type mismatch on sys/cpuset.h")
---
winsup/cygwin/include/sys/cpuset.h | 47 ++++++++++++++++--------------
winsup/cygwin/release/3.4.7 | 3 ++
2 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/winsup/cygwin/include/sys/cpuset.h
b/winsup/cygwin/include/sys/cpuset.h
index d83359fdf..01576b041 100644
--- a/winsup/cygwin/include/sys/cpuset.h
+++ b/winsup/cygwin/include/sys/cpuset.h
@@ -14,9 +14,9 @@ extern "C" {
#endif
typedef __SIZE_TYPE__ __cpu_mask;
-#define __CPU_SETSIZE 1024 // maximum number of logical processors tracked
-#define __NCPUBITS (8 * sizeof (__cpu_mask)) // max size of processor group
-#define __CPU_GROUPMAX (__CPU_SETSIZE / __NCPUBITS) // maximum group number
+#define __CPU_SETSIZE 1024 /* maximum number of logical processors tracked */
+#define __NCPUBITS (8 * sizeof (__cpu_mask)) /* max size of processor group */
+#define __CPU_GROUPMAX (__CPU_SETSIZE / __NCPUBITS) /* maximum group number */
#define __CPUELT(cpu) ((cpu) / __NCPUBITS)
#define __CPUMASK(cpu) ((__cpu_mask) 1 << ((cpu) % __NCPUBITS))
@@ -32,21 +32,21 @@ int __sched_getaffinity_sys (pid_t, size_t, cpu_set_t *);
/* These macros alloc or free dynamically-sized cpu sets of size 'num' cpus.
Allocations are padded such that full-word operations can be done easily.
*/
#define CPU_ALLOC_SIZE(num) __cpuset_alloc_size (num)
Does this patch need __inline defined e.g.
+#include <sys/cdefs.h>
did you perhaps include this directly in your test cases?
-static inline size_t
+static __inline size_t
...
No, not directly. The test case with the shortest list of #includes has:
#define _GNU_SOURCE
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/cpuset.h>
#include <sched.h>
So it's apparently defined by one of those or some sub-include. But indeed it's
not safe to depend on that so I will try harder to figure out what other
occurrences of __inline in the Cygwin source tree are depending on for the definition.
Thanks,
..mark
