From: j8takagi <j8takagi@nifty.com>
Date: Thu, 4 Jun 2026 22:21:27 +0000 (+0900)
Subject: include設定を整理
X-Git-Tag: v0.5p45
X-Git-Url: https://j8takagi.net/gitweb?a=commitdiff_plain;h=3cc7d995c0e454fb677e1625d95a522dfec6b499;p=yacasl2.git

include設定を整理

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

diff --git a/VERSION b/VERSION
index 4c411f7..faed6d0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.5p44
+v0.5p45
diff --git a/include/cerr.h b/include/cerr.h
index 5c644a7..3336d4d 100644
--- 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 74a2335..849f4d6 100644
--- 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 7e6f3c3..52f0ea1 100644
--- 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 6ded1f4..3553b3b 100644
--- 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 3e50a3c..3bc07c2 100644
--- 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 2b560c5..089b84a 100644
--- 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 47c2f4c..746975e 100644
--- 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 baee7da..cf0df6c 100644
--- 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 681c79a..4292fdf 100644
--- 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 f81d640..acf986d 100644
--- 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 e20b863..6da1259 100644
--- 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 0292421..cd429be 100644
--- 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 98f5807..d8376f4 100644
--- 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 9639359..ae8c9e2 100644
--- 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 c511d05..8eb83e1 100644
--- 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 ファイル読み込みのエラー定義