Cygwin: fix build failure due to redefinition of __restrict in sys/cdefs.h

Commit 3c75fac130 fixed the __restrict definition in sys/cdefs.h,
but uncovered a problem in the definition of lio_listio in Cygwin's
aio.h.  It uses the C99 extension of using the restrict keyword
to define non-overlapping arrays. However, this is not allowed in
C++.

Use the newly defined __restrict_arr from commit e66c63be6b
("sys/cdefs.h: introduce __restrict_arr, as in glibc")

Fixes: 3c75fac130 ("sys/cdefs.h: fix for use __restrict in C++"
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2023-08-07 16:04:32 +02:00
parent e66c63be6b
commit 2e7332d6bd
2 changed files with 2 additions and 2 deletions

View File

@ -905,7 +905,7 @@ aio_write (struct aiocb *aio)
} }
int int
lio_listio (int mode, struct aiocb *__restrict const aiolist[__restrict], lio_listio (int mode, struct aiocb *__restrict const aiolist[__restrict_arr],
int nent, struct sigevent *__restrict sig) int nent, struct sigevent *__restrict sig)
{ {
struct aiocb *aio; struct aiocb *aio;

View File

@ -73,7 +73,7 @@ ssize_t aio_return (struct aiocb *);
int aio_suspend (const struct aiocb *const [], int, int aio_suspend (const struct aiocb *const [], int,
const struct timespec *); const struct timespec *);
int aio_write (struct aiocb *); int aio_write (struct aiocb *);
int lio_listio (int, struct aiocb *__restrict const [__restrict], int, int lio_listio (int, struct aiocb *__restrict const [__restrict_arr], int,
struct sigevent *__restrict); struct sigevent *__restrict);
#ifdef __cplusplus #ifdef __cplusplus