From 5c515b1d4e6ae403f93f8ae8a24ba1ad3f62878a Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@gmail.com>
Date: Wed, 16 Oct 2019 21:48:38 +0200
Subject: [PATCH] Remove the include of log_action from logdef
---
include/ana/globals.h | 3 ++-
include/gate.h | 1 -
include/graphics/mylib.h | 4 +---
include/log_action.h | 1 +
include/logdef.h | 2 --
include/loghier.h | 2 ++
include/logsim.h | 2 --
include/logsima.h | 3 ++-
include/logstructs.h | 3 +++
include/tool.h | 2 ++
src/ana/numbers.c | 1 +
src/ana/thermal.c | 1 +
src/diggates.c | 2 ++
src/log.c | 1 +
src/loged.c | 1 +
src/logsim.c | 2 ++
src/logsimasm.c | 1 +
17 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/include/ana/globals.h b/include/ana/globals.h
index 5049978..e1968d7 100644
--- a/include/ana/globals.h
+++ b/include/ana/globals.h
@@ -2,10 +2,11 @@
#define GLOBALS_H
-#include "logdef.h"
#include <graphics/newci.h>
#include <graphics/mylib.h>
#include <utils/newasm.h>
+#include "logdef.h"
+#include "gate.h"
#ifdef GLOBALS_G
# define vextern
diff --git a/include/gate.h b/include/gate.h
index 96bd11d..a4e88f4 100644
--- a/include/gate.h
+++ b/include/gate.h
@@ -1,7 +1,6 @@
#ifndef GATE_H
#define GATE_H
-#include <graphics/mylib.h>
#include <utils/newasm.h>
#include "logdef.h"
diff --git a/include/graphics/mylib.h b/include/graphics/mylib.h
index f15b286..e076e90 100644
--- a/include/graphics/mylib.h
+++ b/include/graphics/mylib.h
@@ -2,6 +2,7 @@
#define MYLIB_H
#include <X11/Xlib.h>
+#include <utils/p2c.h>
typedef uchar m_colorarray[17];
@@ -168,6 +169,3 @@ uchar m_inkeyn();
uchar m_testkey();
#endif /*MYLIB_H*/
-
-
-
diff --git a/include/log_action.h b/include/log_action.h
index 32e9924..a1d52ae 100644
--- a/include/log_action.h
+++ b/include/log_action.h
@@ -6,6 +6,7 @@
#include "wire.h"
#include "page.h"
#include "label.h"
+#include <graphics/mylib.h>
#include <limits.h>
typedef enum
diff --git a/include/logdef.h b/include/logdef.h
index 130a0b7..24b180a 100644
--- a/include/logdef.h
+++ b/include/logdef.h
@@ -2,7 +2,6 @@
#define LOGDEF_H
#include <utils/p2c.h>
-#include <graphics/mylib.h>
#include <utils/strlist.h>
#include <utils/newasm.h>
@@ -243,5 +242,4 @@ typedef struct log_colorrec {
#undef vextern
-#include <log_action.h>
#endif /*LOGDEF_H*/
diff --git a/include/loghier.h b/include/loghier.h
index eb44224..1b7d9d7 100644
--- a/include/loghier.h
+++ b/include/loghier.h
@@ -4,6 +4,8 @@
#include "logdef.h"
#include <utils/newasm.h>
#include <graphics/mylib.h>
+#include "gate.h"
+#include "label.h"
void hier_init (log_action_t *act);
int commandlabel (log_lrec *lp, char *cmd, char *args);
diff --git a/include/logsim.h b/include/logsim.h
index 0c03576..f1e697a 100644
--- a/include/logsim.h
+++ b/include/logsim.h
@@ -31,5 +31,3 @@ extern void log_16_noprog (log_16_action *act);
#endif /*LOGSIM_H*/
-
-
diff --git a/include/logsima.h b/include/logsima.h
index 18faf6e..b6bcf81 100644
--- a/include/logsima.h
+++ b/include/logsima.h
@@ -6,6 +6,7 @@
#include "logdig.h"
#include <utils/newasm.h>
#include "tool.h"
+#include "gate.h"
#ifdef LOGSIMA_G
@@ -22,7 +23,7 @@ typedef struct nodeinfo {
typedef struct kindinfo {
na_long info;
int hasproc, instance;
- short numppins, numpvars;
+ short numppins, numpvars; // TODO move in gateinfo
void (*kindproc) (log_16_action *act);
log_krec *knext;
} kindinfo;
diff --git a/include/logstructs.h b/include/logstructs.h
index af24349..d59106f 100644
--- a/include/logstructs.h
+++ b/include/logstructs.h
@@ -3,6 +3,9 @@
#include "settings.h"
#include "logdef.h"
+#include "wire.h"
+#include "gate.h"
+#include "label.h"
/** ??? */
typedef struct descrec {
diff --git a/include/tool.h b/include/tool.h
index 7c64c49..271adf0 100644
--- a/include/tool.h
+++ b/include/tool.h
@@ -2,6 +2,8 @@
#define LOG_TOOL_H
#include "logdef.h"
+#include "gate.h"
+#include "log_action.h"
typedef struct log_tool {
char name[17];
diff --git a/src/ana/numbers.c b/src/ana/numbers.c
index 4916f6b..458dc29 100644
--- a/src/ana/numbers.c
+++ b/src/ana/numbers.c
@@ -27,6 +27,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <utils/p2c.h>
#include "ana/numbers.h"
+#include "log_action.h"
#define TitleX (-80)
diff --git a/src/ana/thermal.c b/src/ana/thermal.c
index 2962006..1649b29 100644
--- a/src/ana/thermal.c
+++ b/src/ana/thermal.c
@@ -26,6 +26,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <utils/p2c.h>
+#include "log_action.h"
#include "ana/thermal.h"
#define N_Kelvin 1
diff --git a/src/diggates.c b/src/diggates.c
index 42d3e23..985c5d2 100644
--- a/src/diggates.c
+++ b/src/diggates.c
@@ -27,6 +27,8 @@
#include <utils/p2c.h>
#include <utils/strings.h>
+#include "log_action.h"
+#include "gate.h"
#include "mygates.h"
diff --git a/src/log.c b/src/log.c
index 290ea11..f8643c4 100644
--- a/src/log.c
+++ b/src/log.c
@@ -43,6 +43,7 @@
#include <utils/p2c.h>
#include "logdef.h"
+#include "log_action.h"
#include <utils/sysglobals.h>
#include <utils/sysdevs.h>
diff --git a/src/loged.c b/src/loged.c
index 6c252ee..ef62bb5 100644
--- a/src/loged.c
+++ b/src/loged.c
@@ -52,6 +52,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "logdef.h"
+#include "log_action.h"
#include <graphics/mylib.h>
#include <graphics/newci.h>
#include <graphics/newkbd.h>
diff --git a/src/logsim.c b/src/logsim.c
index 0e32316..65111e7 100644
--- a/src/logsim.c
+++ b/src/logsim.c
@@ -37,7 +37,9 @@
#include <utils/p2c.h>
#include <stdlib.h>
+#include "log_action.h"
#include "logsim.h"
+#include "logsima.h"
#include "node.h"
#include "tool.h"
#include "logstuff.h"
diff --git a/src/logsimasm.c b/src/logsimasm.c
index 625ec13..9a8c4d4 100644
--- a/src/logsimasm.c
+++ b/src/logsimasm.c
@@ -33,6 +33,7 @@
#include "node.h"
#include "logstuff.h"
+#include "log_action.h"
#define trace_16 (logsima_action.lact->quiet ? -1 : 0)
--
GitLab