From b4be8852a467efd51679d5572867824cc0454d45 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 20 Nov 2018 20:30:44 -0500
Subject: [PATCH] suppress compiler warning differently

---
 include/tradstdc.h | 5 +++++
 util/makedefs.c    | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/tradstdc.h b/include/tradstdc.h
index 1caf7a667..5e5cbd7c2 100644
--- a/include/tradstdc.h
+++ b/include/tradstdc.h
@@ -389,6 +389,11 @@ typedef genericptr genericptr_t; /* (void *) or (char *) */
 #undef signed
 #endif
 
+#ifdef __clang__
+#define UNUSED __attribute__((unused))
+#define NORETURN __attribute__((noreturn))
+#endif
+
 /*
  * Allow gcc2 to check parameters of printf-like calls with -Wformat;
  * append this to a prototype declaration (see pline() in extern.h).
diff --git a/util/makedefs.c b/util/makedefs.c
index a9a39048f..0b97a8bcb 100644
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -53,7 +53,7 @@
 #endif
 
 #if defined(UNIX) && !defined(LINT) && !defined(GCC_WARN)
-static const char SCCS_Id[] = "@(#)makedefs.c\t3.6\t2018/03/02";
+static const char SCCS_Id[] UNUSED = "@(#)makedefs.c\t3.6\t2018/03/02";
 #endif
 
 /* names of files to be generated */
@@ -298,8 +298,6 @@ link_sanity_check()
     monst_init();
     objects_init();
 
-    /* Quiet unused warning */
-    (void) SCCS_Id;
 }
 
 void