From 4e31c050e005692da71a084d31c03960a3e6ce23 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Thu, 21 Feb 2019 21:39:56 +0100
Subject: [PATCH] Logdig: fix unwanted define
---
include/logdig.h | 16 ++++------------
src/logdig.c | 10 ----------
2 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/include/logdig.h b/include/logdig.h
index 595a453..5e16fe5 100644
--- a/include/logdig.h
+++ b/include/logdig.h
@@ -4,14 +4,6 @@
#include "logdef.h"
#include <utils/sysglobals.h>
-#ifdef LOGDIG_G
-# define vextern
-#else
-# define vextern extern
-#endif
-
-
-
#define log_16_simtype 16
@@ -48,10 +40,10 @@ typedef struct log_16_action {
void (*hook_plotled) (log_action_t *lact, short x, short y, log_16_value v);
} log_16_action;
-vextern const log_16_viarr log_16_vi;
-vextern const log_16_ivarr log_16_iv;
-vextern const log_16_vbarr log_16_vb;
-vextern const log_16_bvarr log_16_bv;
+extern const log_16_viarr log_16_vi;
+extern const log_16_ivarr log_16_iv;
+extern const log_16_vbarr log_16_vb;
+extern const log_16_bvarr log_16_bv;
#undef vextern
diff --git a/src/logdig.c b/src/logdig.c
index ef5a930..268f5d9 100644
--- a/src/logdig.c
+++ b/src/logdig.c
@@ -39,7 +39,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <utils/p2c.h>
-#define LOGDIG_G
#include "logdig.h"
@@ -59,14 +58,5 @@ const log_16_bvarr log_16_bv = {
log_zero, log_one
};
-
-
-
/* All the real stuff is in LOGSIM and LOGSIMA */
-
-
-
-
-
-
--
GitLab