From 50280b1c5ce30c1f19b32322f727584d4711a85a Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 21 Aug 2020 17:21:36 -0700 Subject: [PATCH 1/4] Included spell/summon-types.h to avoid compiler error (incomplete type for summon_type) with clang 11.0.3. --- src/cmd-item/cmd-usestaff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c index e2ba84d12..23674d450 100644 --- a/src/cmd-item/cmd-usestaff.c +++ b/src/cmd-item/cmd-usestaff.c @@ -36,6 +36,7 @@ #include "spell/spells-staff-only.h" #include "spell/spells-status.h" #include "spell/spells-summon.h" +#include "spell/summon-types.h" #include "status/action-setter.h" #include "status/bad-status-setter.h" #include "status/base-status.h" -- 2.24.3 (Apple Git-128) From be47ed3cf60e4f366af9f2a069ee76c836d85b82 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Fri, 21 Aug 2020 17:28:30 -0700 Subject: [PATCH 2/4] Included additional headers to avoid incomplete type errors with clang 11.0.3 for arena_type and its components. --- src/market/arena-info-table.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/market/arena-info-table.h b/src/market/arena-info-table.h index 72f3e6858..9914aad74 100644 --- a/src/market/arena-info-table.h +++ b/src/market/arena-info-table.h @@ -1,8 +1,9 @@ #pragma once +#include "object/tval-types.h" #include "system/angband.h" +#include "system/building-type-definition.h" #define MAX_ARENA_MONS 41 /* Date: Fri, 21 Aug 2020 17:40:45 -0700 Subject: [PATCH 3/4] Include object/tval-types.h to avoid an incomplete type error from clang 11.0.3 for tval_type. Can reverse the addition of that header in market/arena-info-table.h since it is now included in building-type-definition.h. --- src/market/arena-info-table.h | 1 - src/system/building-type-definition.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/market/arena-info-table.h b/src/market/arena-info-table.h index 9914aad74..1af901217 100644 --- a/src/market/arena-info-table.h +++ b/src/market/arena-info-table.h @@ -1,6 +1,5 @@ #pragma once -#include "object/tval-types.h" #include "system/angband.h" #include "system/building-type-definition.h" diff --git a/src/system/building-type-definition.h b/src/system/building-type-definition.h index 702761250..8764e36a4 100644 --- a/src/system/building-type-definition.h +++ b/src/system/building-type-definition.h @@ -1,6 +1,7 @@ #pragma once /* 人畜無害なenumヘッダを先に読み込む */ +#include "object/tval-types.h" #include "player/player-classes-types.h" #include "player/player-race-types.h" #include "realm/realm-types.h" @@ -11,7 +12,6 @@ /*! * @brief 闘技場のモンスターエントリー構造体 / A structure type for on_defeat_arena_monster entry */ -typedef enum tval_type tval_type; typedef struct arena_type { MONRACE_IDX r_idx; /*!< 闘技場のモンスター種族ID(0ならば表彰式) / Monster (0 means victory prizing) */ tval_type tval; /*!< モンスター打倒後に得られるアイテムの大カテゴリID / tval of prize (0 means no prize) */ -- 2.24.3 (Apple Git-128) From 146d0592df45066af60622a71403e4a4484bbf69 Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Sun, 6 Sep 2020 09:50:09 -0700 Subject: [PATCH 4/4] Included spell/summon-types.h to avoid incomplete type errors with clang or gcc. --- src/spell-kind/blood-curse.c | 1 + src/wizard/wizard-spells.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/spell-kind/blood-curse.c b/src/spell-kind/blood-curse.c index f702ba840..0d973899c 100644 --- a/src/spell-kind/blood-curse.c +++ b/src/spell-kind/blood-curse.c @@ -9,6 +9,7 @@ #include "spell-kind/spells-teleport.h" #include "spell/spell-types.h" #include "spell/spells-summon.h" +#include "spell/summon-types.h" #include "status/base-status.h" #include "status/experience.h" #include "system/floor-type-definition.h" diff --git a/src/wizard/wizard-spells.c b/src/wizard/wizard-spells.c index 7dfb682d6..b57159163 100644 --- a/src/wizard/wizard-spells.c +++ b/src/wizard/wizard-spells.c @@ -18,6 +18,7 @@ #include "spell-kind/spells-teleport.h" #include "spell-realm/spells-chaos.h" #include "spell/spells-status.h" +#include "spell/summon-types.h" #include "system/floor-type-definition.h" #include "target/target-checker.h" #include "target/grid-selector.h" -- 2.24.3 (Apple Git-128)