From eda7a89d36543688992c369bc33817191656d39d Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Tue, 29 Jan 2019 23:39:55 +0100
Subject: [PATCH] Move some declarations

---
 include/graphics/newcrt.h |  4 ++--
 include/logglobals.h      | 10 ----------
 include/logstuff.h        |  6 +++---
 include/screen.h          |  2 ++
 include/utils/p2c.h       |  2 ++
 src/log.c                 |  2 --
 src/pagereader.c          |  1 +
 7 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/include/graphics/newcrt.h b/include/graphics/newcrt.h
index 37e6c2a..8d3446d 100644
--- a/include/graphics/newcrt.h
+++ b/include/graphics/newcrt.h
@@ -202,8 +202,8 @@ void nc_getXY (long *x, long *y);
 void nc_setXY (int x, int y);
 void nc_gotoXY (int x, int y);
 void nc_cursXY (int x, int y);
-void nc_cursorOn ();
-void nc_cursorOff ();
+void nc_cursor_on();
+void nc_cursor_off();
 void nc_nothing ();
 void nc_unInit ();
 void nc_init ();
diff --git a/include/logglobals.h b/include/logglobals.h
index f400fae..2e1fdc0 100644
--- a/include/logglobals.h
+++ b/include/logglobals.h
@@ -6,8 +6,6 @@
 #include "settings.h"
 #include "logstructs.h"
 
-extern char *GetChipmunkPath();
-
 /* 0*/
 /* If the pen is in "this" sector, */
 /* 1*/
@@ -200,12 +198,4 @@ extern int suppressdots;   /* Temporarily suppressing red dots */
 extern int glowsolder;   /* Display solder dots in Glow mode */
 extern int vlsi;   /* Current page is VLSI mode */
 
-
-extern void m_saveclip ();
-
-extern void nc_cursor_on ();
-
-extern void nc_cursor_off ();
-
-
 #endif
diff --git a/include/logstuff.h b/include/logstuff.h
index ae449e6..6cdd5ae 100644
--- a/include/logstuff.h
+++ b/include/logstuff.h
@@ -1,9 +1,9 @@
 #ifndef LOGSTUFF_H
 #define LOGSTUFF_H
 
-extern void init_X_screen(void);
-extern void recolor_log_cursors(int color, int force);
-extern void choose_log_cursor(int curs);
+void recolor_log_cursors(int color, int force);
+void choose_log_cursor(int curs);
+void m_saveclip ();
 
 int findprocedure(char *name, void (**proc)());
 
diff --git a/include/screen.h b/include/screen.h
index 544aea0..5952ed9 100644
--- a/include/screen.h
+++ b/include/screen.h
@@ -131,4 +131,6 @@ void xorcursor();
 
 int hvline(short x1, short y1, short *x2, short *y2);
 
+void init_X_screen();
+
 #endif
diff --git a/include/utils/p2c.h b/include/utils/p2c.h
index 5e2add3..6f60d5c 100644
--- a/include/utils/p2c.h
+++ b/include/utils/p2c.h
@@ -110,6 +110,8 @@ long    *P_addsetr    (long *, unsigned, unsigned) DEPRECATED;
 long    *P_remset     (long *, unsigned) DEPRECATED;
 long    *P_expset     (long *, long) DEPRECATED;
 
+char *GetChipmunkPath();
+
 /* I/O error handling */
 #define _SETIO(cond,ior)          (P_ioresult = (cond) ? 0 : (ior))
 
diff --git a/src/log.c b/src/log.c
index 0caeb20..84d93be 100644
--- a/src/log.c
+++ b/src/log.c
@@ -76,8 +76,6 @@
 
 #include "configreader.h"
 
-char *GetChipmunkPath();
-
 enum cursors;
 enum cursors cursortype;
 enum cursors oldcursortype;
diff --git a/src/pagereader.c b/src/pagereader.c
index a2dae78..668e65a 100644
--- a/src/pagereader.c
+++ b/src/pagereader.c
@@ -1,5 +1,6 @@
 #include "pagereader.h"
 
+#include <utils/p2c.h>
 #include "logfont.h"
 #include "node.h"
 #include "log.h"
-- 
GitLab