From 817b4686ce27e68459b8db202a3bf9ffc20e76db Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 6 Sep 2022 08:01:50 -0400
Subject: [PATCH] Revert "move struct propname to a header file"

This reverts commit 402b2bf5c864c04a673658d6ad9bed159b581ca6.
---
 include/timeout.h | 5 -----
 src/cmd.c         | 5 ++++-
 src/timeout.c     | 5 ++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/timeout.h b/include/timeout.h
index f3a853b68..45aab9545 100644
--- a/include/timeout.h
+++ b/include/timeout.h
@@ -60,9 +60,4 @@ typedef struct fe {
     Bitfield(needs_fixup, 1); /* does arg need to be patched? */
 } timer_element;
 
-struct propname {
-    int prop_num;
-    const char *prop_name;
-};
-
 #endif /* TIMEOUT_H */
diff --git a/src/cmd.c b/src/cmd.c
index e6d0d5a1f..e2d9d1687 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1952,7 +1952,10 @@ static int
 wiz_intrinsic(void)
 {
     if (wizard) {
-        extern const struct propname propertynames[]; /* timeout.c */
+        extern const struct propname {
+            int prop_num;
+            const char *prop_name;
+        } propertynames[]; /* timeout.c */
         static const char wizintrinsic[] = "#wizintrinsic";
         static const char fmt[] = "You are%s %s.";
         winid win;
diff --git a/src/timeout.c b/src/timeout.c
index d4f01fca8..ed3a8ed38 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -21,7 +21,10 @@ static void cleanup_burn(ANY_P *, long);
 
 /* used by wizard mode #timeout and #wizintrinsic; order by 'interest'
    for timeout countdown, where most won't occur in normal play */
-const struct propname propertynames[] = {
+const struct propname {
+    int prop_num;
+    const char *prop_name;
+} propertynames[] = {
     { INVULNERABLE, "invulnerable" },
     { STONED, "petrifying" },
     { SLIMED, "becoming slime" },
-- 
2.49.0