From 11efd1561314d22063f78222434b0f3999f9dc5d Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Sat, 24 Dec 2022 15:45:14 -0800
Subject: [PATCH] Clean up usage of the native address of the MiscStats and its
 struct typedef

The global variable MiscStats is declared extern in "lspglob.h"
The structure that MiscStats points to is MISCSTATS and is defined in "miscstats.h"
---
 src/dosmouse.c | 2 +-
 src/keyevent.c | 2 --
 src/mnwevent.c | 1 -
 src/xwinman.c  | 4 +---
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/dosmouse.c b/src/dosmouse.c
index 85fc48f..ffd90b6 100644
--- a/src/dosmouse.c
+++ b/src/dosmouse.c
@@ -25,9 +25,9 @@
 #include "keyboard.h"
 #include "ifpage.h"
 #include "iopage.h"
+#include "miscstat.h"
 
 extern int eurokbd;
-extern MISCSTATS *MiscStats;
 extern IFPAGE *InterfacePage;
 extern int KBDEventFlg;
 extern DspInterface currentdsp;
diff --git a/src/keyevent.c b/src/keyevent.c
index dceccc3..4a31f4e 100644
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -50,7 +50,6 @@ void Mouse_hndlr(void); /* Fields mouse events from driver        */
 #include "lsptypes.h"
 
 #include "ifpage.h"
-#include "miscstat.h"
 
 #include "bb.h"
 #include "bitblt.h"
@@ -132,7 +131,6 @@ extern DLword *DisplayRegion68k;
 static struct timeval SelectTimeout = {0, 0};
 #endif /* DOS */
 
-extern MISCSTATS *MiscStats;
 LispPTR *LASTUSERACTION68k;
 LispPTR *CLastUserActionCell68k;
 LispPTR *CURSORDESTHEIGHT68k;
diff --git a/src/mnwevent.c b/src/mnwevent.c
index 1c90c41..4ab8cef 100644
--- a/src/mnwevent.c
+++ b/src/mnwevent.c
@@ -43,7 +43,6 @@ extern LispPTR *MakeAtom68k();
 extern DLword *EmCursorX68K, *EmCursorY68K;
 extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K;
 extern LispPTR *CLastUserActionCell68k;
-extern MISCSTATS *MiscStats;
 
 extern int KBDEventFlg;
 LispPTR *MNWBUFFERING68k = 0;
diff --git a/src/xwinman.c b/src/xwinman.c
index 9231e30..0650518 100644
--- a/src/xwinman.c
+++ b/src/xwinman.c
@@ -18,8 +18,7 @@
 #include "devif.h"         // for (anonymous), MRegion, DefineCursor, OUTER_...
 #include "keyeventdefs.h"  // for kb_trans
 #include "lispemul.h"      // for PUTBASEBIT68K, FALSE, TRUE, DLword, state
-#include "miscstat.h"      // for MISCSTATS
-#include "version.h"
+#include "lspglob.h"       // for MiscStats
 #include "xdefs.h"         // for XLOCK, XUNLOCK
 #include "xlspwindefs.h"   // for DoRing
 #include "xscrolldefs.h"   // for JumpScrollHor, JumpScrollVer, Scroll, Scro...
@@ -35,7 +34,6 @@ extern DspInterface currentdsp;
 extern DLword *EmCursorX68K, *EmCursorY68K;
 extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K;
 extern LispPTR *CLastUserActionCell68k;
-extern MISCSTATS *MiscStats;
 extern int KBDEventFlg;
 extern u_char *SUNLispKeyMap;
 #define KEYCODE_OFFSET 7 /* Sun Keycode offset */