* lib/full-write.c (const): Do not #define. Instead, use CONST. (CONST): New macro. (full_rw): Omit unnecessary cast. --- ChangeLog | 5 +++++ lib/full-write.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog index fd8e899b93..079abf281f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2026-05-07 Paul Eggert <[email protected]> + full-write: pacify GCC 16 -Wkeyword-macro + * lib/full-write.c (const): Do not #define. Instead, use CONST. + (CONST): New macro. + (full_rw): Omit unnecessary cast. + fts: pacify GCC 16 -Wfree-labels Evidently those FALLTHROUGHs were put in to pacify an old version of GCC, but that’s no longer needed and nowadays diff --git a/lib/full-write.c b/lib/full-write.c index 46266c7b56..a6f87d6a47 100644 --- a/lib/full-write.c +++ b/lib/full-write.c @@ -30,12 +30,12 @@ # include "safe-read.h" # define safe_rw safe_read # define full_rw full_read -# undef const -# define const /* empty */ +# define CONST /* empty */ #else # include "safe-write.h" # define safe_rw safe_write # define full_rw full_write +# define CONST const #endif #ifdef FULL_READ @@ -55,10 +55,10 @@ When reading, if fewer than COUNT bytes are read, you must examine errno to distinguish failure from EOF (errno == 0). */ idx_t -full_rw (int fd, const void *buf, idx_t count) +full_rw (int fd, void CONST *buf, idx_t count) { idx_t total = 0; - const char *ptr = (const char *) buf; + char CONST *ptr = buf; while (count > 0) { -- 2.54.0
