Commit: a94d1e04390079ef908753bc4acb2b88c945f560 - hengband (git)

変愚蛮怒のメインリポジトリです

Commit MetaInfo

• Revision: a94d1e04390079ef908753bc4acb2b88c945f560 (tree)
• Time: 2020-03-16 19:06:32
• Author: shimitei <shimitei@gmai...>
• Commiter: shimitei

Log Message

[Fix] duplicate symbol

Change Summary

• modified: src/rooms-city.c
• modified: src/rooms-city.h
• modified: src/rooms.c
• modified: src/rooms.h

Incremental Difference

--- a/src/rooms-city.c
+++ b/src/rooms-city.c
@@ -5,6 +5,7 @@
 #include "rooms-city.h"
 #include "store.h"
 
+ugbldg_type *ugbldg;
 
 
 /*

--- a/src/rooms-city.h
+++ b/src/rooms-city.h
@@ -14,4 +14,4 @@ typedef struct
 }
 ugbldg_type;
 
-ugbldg_type *ugbldg;
+extern ugbldg_type *ugbldg;

--- a/src/rooms.c
+++ b/src/rooms.c
@@ -53,6 +53,7 @@
 
 #include "monster.h"
 
+door_type feat_door[MAX_DOOR_TYPES];
 
 /*!
  * 各部屋タイプの生成比定義

--- a/src/rooms.h
+++ b/src/rooms.h
@@ -81,7 +81,7 @@ typedef struct
 	FEAT_IDX num_jammed;
 } door_type;
 
-door_type feat_door[MAX_DOOR_TYPES];
+extern door_type feat_door[MAX_DOOR_TYPES];
 
 extern bool generate_rooms(void);
 extern void build_maze_vault(POSITION x0, POSITION y0, POSITION xsize, POSITION ysize, bool is_vault);