From 221af1197f8aedecfce840123213a1e91dec18c2 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Sun, 16 Dec 2018 18:05:41 +0100
Subject: [PATCH] Mode label struct into label.h
---
log/include/label.h | 8 ++++++++
log/include/log_action.h | 1 +
log/include/logdef.h | 8 --------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/log/include/label.h b/log/include/label.h
index 4c16a77..034d667 100644
--- a/log/include/label.h
+++ b/log/include/label.h
@@ -3,6 +3,14 @@
#include "logdef.h"
+typedef struct log_lrec {
+ short x, y, w;
+ char name[log_lablen + 1];
+ unsigned f7 : 1, f6 : 1, f5 : 1, f4 : 1, f3 : 1, f2 : 1, f1 : 1, f0 : 1;
+ struct log_lrec *next;
+ na_long temp;
+} log_lrec; /* Label */
+
void parselabel(strlist_t **lbl, short *numattrs, log_kattrrec **attr);
#endif
diff --git a/log/include/log_action.h b/log/include/log_action.h
index d808d5a..d81b99c 100644
--- a/log/include/log_action.h
+++ b/log/include/log_action.h
@@ -5,6 +5,7 @@
#include "gate.h"
#include "wire.h"
#include "page.h"
+#include "label.h"
#include<limits.h>
typedef enum
diff --git a/log/include/logdef.h b/log/include/logdef.h
index 027b2ef..a8f88db 100644
--- a/log/include/logdef.h
+++ b/log/include/logdef.h
@@ -235,14 +235,6 @@ typedef struct log_hnrec {
struct log_hnrec *next;
} log_hnrec; /* History name */
-typedef struct log_lrec {
- short x, y, w;
- char name[log_lablen + 1];
- unsigned f7 : 1, f6 : 1, f5 : 1, f4 : 1, f3 : 1, f2 : 1, f1 : 1, f0 : 1;
- struct log_lrec *next;
- na_long temp;
-} log_lrec; /* Label */
-
typedef struct log_brec {
short x1, y1, x2, y2;
struct log_brec *next;
--
GitLab