include設定を整理

https://claude.ai/share/de960664-5b66-4a90-9fb6-b9e1a941bc9f

diff --git a/VERSION b/VERSION
index 4c411f783aca6ee4fe55c33eafff04fd39ff7c7d..faed6d088ecf1afab81c72fba14b865f9a811df6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.5p44
+v0.5p45

diff --git a/include/cerr.h b/include/cerr.h
index 5c644a756f655fc49efda69d49ec6ce15dcf7000..3336d4dedf759f28052e6b5336279b909e865dda 100644 (file)
--- a/include/cerr.h
+++ b/include/cerr.h
@@ -1,7 +1,6 @@
 #ifndef YACASL2_CERR_H_INCLUDED
 #define YACASL2_CERR_H_INCLUDED
 
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/include/disassemble.h b/include/disassemble.h
index 74a23359d362939935af4b8c24b3f8bbc7b0f576..849f4d647940692e6c5869b0b651295d1d56c877 100644 (file)
--- a/include/disassemble.h
+++ b/include/disassemble.h
@@ -1,6 +1,7 @@
-#ifndef YACASL2_DISASSEMBLE_H_INCLUDE
-#define YACASL2_DISASSEMBLE_H_INCLUDE
+#ifndef YACASL2_DISASSEMBLE_H_INCLUDED
+#define YACASL2_DISASSEMBLE_H_INCLUDED
 
+#include "word.h"
 #include "struct.h"
 
 /**

diff --git a/include/exec.h b/include/exec.h
index 7e6f3c36fe80d60714cfbaf1646732bf99a61b39..52f0ea1e7ab4459494812259c09d93501d1e7f98 100644 (file)
--- a/include/exec.h
+++ b/include/exec.h
@@ -9,7 +9,6 @@
 #include "word.h"
 #include "cmem.h"
 #include "cerr.h"
-#include "monitor.h"
 #include "disassemble.h"
 
 enum {

diff --git a/include/load.h b/include/load.h
index 6ded1f4608ef4b6d91ba39d70eb78a3043f4280e..3553b3b031f65ab784b878268a5e1d2316540c35 100644 (file)
--- a/include/load.h
+++ b/include/load.h
@@ -1,5 +1,8 @@
-#ifndef YACASL2_LOAD_H_INCLUDE
-#define YACASL2_LOAD_H_INCLUDE
+#ifndef YACASL2_LOAD_H_INCLUDED
+#define YACASL2_LOAD_H_INCLUDED
+#include "word.h"
+#include "struct.h"
+#include "cerr.h"
 
 /**
  * @brief アセンブル結果読み込みエラーをエラーリストに追加する

diff --git a/include/monitor.h b/include/monitor.h
index 3e50a3cccaee6500e95e3882b91d088ba0063a60..3bc07c207c727b56fd5661d5c69737d224341b31 100644 (file)
--- a/include/monitor.h
+++ b/include/monitor.h
@@ -1,5 +1,5 @@
-#ifndef YACASL2_MONITOR_H_INCLUDE
-#define YACASL2_MONITOR_H_INCLUDE
+#ifndef YACASL2_MONITOR_H_INCLUDED
+#define YACASL2_MONITOR_H_INCLUDED
 
 #include <stdio.h>
 #include <string.h>

diff --git a/include/package.h b/include/package.h
index 2b560c55ca1d5bb423e7df172f21a25482a6649c..089b84ae877bda45548528f9a98dbcd3c24514d7 100644 (file)
--- a/include/package.h
+++ b/include/package.h
@@ -4,7 +4,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#define _GNU_SOURCE
 #include <getopt.h>
 #include "cmem.h"
 #include "cerr.h"

diff --git a/include/struct.h b/include/struct.h
index 47c2f4ce805ec4a47b9b84a41a641f980f44a600..746975ed7829f87ee6ecae3fd44274cae5b05e6e 100644 (file)
--- a/include/struct.h
+++ b/include/struct.h
@@ -1,5 +1,5 @@
-#ifndef YACASL2_STRUCT_INCLUDED
-#define YACASL2_STRUCT_INCLUDED
+#ifndef YACASL2_STRUCT_H_INCLUDED
+#define YACASL2_STRUCT_H_INCLUDED
 
 #include <stdio.h>
 #include <assert.h>
@@ -8,7 +8,6 @@
 #include "word.h"
 #include "cmem.h"
 #include "hash.h"
-#include "exec.h"
 
 /**
  * @brief COMET IIの規格値

diff --git a/include/token.h b/include/token.h
index baee7daa5fd5204e7e3b9548aca89ab9baf5dffc..cf0df6c2ced128e957f6740f39b9b1dce2d1b017 100644 (file)
--- a/include/token.h
+++ b/include/token.h
@@ -1,5 +1,5 @@
-#ifndef YACASL2_TOKEN_INCLUDE
-#define YACASL2_TOKEN_INCLUDE
+#ifndef YACASL2_TOKEN_H_INCLUDED
+#define YACASL2_TOKEN_H_INCLUDED
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/casl2.c b/src/casl2.c
index 681c79ae37f5705c3d9329118b38d0ec86825dd1..4292fdf31ae606ec0829ea782b364101609ae40d 100644 (file)
--- a/src/casl2.c
+++ b/src/casl2.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include "package.h"
 #include "assemble.h"
 #include "exec.h"

diff --git a/src/casl2rev.c b/src/casl2rev.c
index f81d6402a5570eb26158e769e90d0cf1bef71fe0..acf986d20e0274abb1b4d97354e8c30af8285990 100644 (file)
--- a/src/casl2rev.c
+++ b/src/casl2rev.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include "package.h"
 #include "disassemble.h"
 #include "load.h"

diff --git a/src/comet2.c b/src/comet2.c
index e20b8635a6a431422f5019825b4995bdbc270e6a..6da125948dbe0882108d95bd895e5a3ef2bf335d 100644 (file)
--- a/src/comet2.c
+++ b/src/comet2.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include "package.h"
 #include "exec.h"
 #include "load.h"

diff --git a/src/comet2monitor.c b/src/comet2monitor.c
index 0292421d0f8a7d96569abefbb006f79946947ba5..cd429be10849cc468dfa828cf302f910caf27cd2 100644 (file)
--- a/src/comet2monitor.c
+++ b/src/comet2monitor.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include "package.h"
 #include "exec.h"
 #include "load.h"

diff --git a/src/dumpword.c b/src/dumpword.c
index 98f5807354ccb5b99aaed9fe8d56a55513f1237c..d8376f4f42f1850530517d1082039c0ca7e152dc 100644 (file)
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include "package.h"
 #include "word.h"
 

diff --git a/src/exec.c b/src/exec.c
index 9639359b413104471b37837aa504efdf4d0def5a..ae8c9e2a2ca5237a06a9613c43baaa6dd364ae56 100644 (file)
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,4 +1,5 @@
 #include "exec.h"
+#include "monitor.h"
 
 /**
  * @brief プログラムレジスタ（PR）を表すWORD値を文字列に変換

diff --git a/src/load.c b/src/load.c
index c511d05799d2560d287f87c2b4fb5c665b0468d9..8eb83e1e1ce76b745139b0508be446f570d87ce9 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -1,12 +1,5 @@
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include "load.h"
 
-#include "word.h"
-#include "struct.h"
-#include "cerr.h"
 
 /**
  * @brief ファイル読み込みのエラー定義