From a5ed0d03631413a4e709f5da39f1f216bd739ae3 Mon Sep 17 00:00:00 2001 From: nhmall Date: Wed, 1 Feb 2023 09:41:35 -0500 Subject: [PATCH] follow-up --- include/tradstdc.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/tradstdc.h b/include/tradstdc.h index 4361620cf..02f4c4a57 100644 --- a/include/tradstdc.h +++ b/include/tradstdc.h @@ -460,12 +460,18 @@ typedef genericptr genericptr_t; /* (void *) or (char *) */ #endif /* - * Allow gcc to catch the use of non-C99 functions that NetHack - * has replaced with a C99 standard function. The old non-C99 + * Allow gcc and clang to catch the use of non-C99 functions that + * NetHack has replaced with a C99 standard function. The old non-C99 * function will cause a link failure on non-Unix platforms, * so it is preferrable to catch it early, during compile. */ -#if defined(__GNUC__) || defined(__CLANG__) +#if defined(__GNUC__) && !defined(__CLANG__) +#if __GNUC__ >= 12 +inline char *index(const char *s, int c) __attribute__ ((unavailable)); +inline char *rindex(const char *s, int c) __attribute__ ((unavailable)); +#endif +#endif +#if defined(__clang__) inline char *index(const char *s, int c) __attribute__ ((unavailable)); inline char *rindex(const char *s, int c) __attribute__ ((unavailable)); #endif