From c9f875b15ff458afb0c28dc1e8e95aa155234657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A1roly=20Balogh?= <karoly@freepascal.org>
Date: Sat, 22 May 2021 08:21:10 +0000
Subject: [PATCH] qlunits: fix SMS unit build, declare all const/vars/types
 before functions, and minor tweaks

git-svn-id: trunk@49391 -
---
 packages/qlunits/src/qdos.pas        | 3 ++-
 packages/qlunits/src/sms.pas         | 4 +++-
 packages/qlunits/src/sms_sysvars.inc | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/qlunits/src/qdos.pas b/packages/qlunits/src/qdos.pas
index d678c09b6d..db86eb837f 100644
--- a/packages/qlunits/src/qdos.pas
+++ b/packages/qlunits/src/qdos.pas
@@ -142,13 +142,14 @@ type
   end;
   PWindowDef = ^TWindowDef;
 
+{ Variable/type includes before function declarations }
+{$i qdos_sysvars.inc}
 
 { the functions declared in qdosfuncs.inc are implemented in the system unit. They're included
   here via externals, do avoid double implementation of assembler wrappers. for this reason,
   qdosfuncs.inc in packages/qlunits must be kept identical to the one in rtl/sinclairql (KB). }
 
 {$i qdosfuncs.inc}
-{$i qdos_sysvars.inc}
 
 { other functions, not used/implemented by the RTL }
 
diff --git a/packages/qlunits/src/sms.pas b/packages/qlunits/src/sms.pas
index 3da4d3c5e3..a48ce666b3 100644
--- a/packages/qlunits/src/sms.pas
+++ b/packages/qlunits/src/sms.pas
@@ -22,12 +22,14 @@ uses
   qdos;
 
 
+{ Variable/type includes before function declarations }
+{$i sms_sysvars.inc}
+
 { the functions declared in smsfuncs.inc are implemented in the system unit. They're included
   here via externals, do avoid double implementation of assembler wrappers. for this reason,
   smsfuncs.inc in packages/qlunits must be kept identical to the one in rtl/sinclairql (KB). }
 
 {$i smsfuncs.inc}
-{$i sms_sysvars.inc}
 
 
 implementation
diff --git a/packages/qlunits/src/sms_sysvars.inc b/packages/qlunits/src/sms_sysvars.inc
index 5cca4d6640..1cb46588c0 100644
--- a/packages/qlunits/src/sms_sysvars.inc
+++ b/packages/qlunits/src/sms_sysvars.inc
@@ -12,7 +12,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-{
+
 
 { This file holds the system variables for an SMSQ system and uses
   the SMSQ naming convention. ND. }
@@ -220,7 +220,7 @@ Type
     sys_xdly: Byte;      { Suspend delay after executing another job [SMSQ/E 3.13+] }
     sys_ouch: Byte;      { Ouch flag (currently used to activate SGC debug) [SMSQ] }
 
-  end; 
+  end;
 
   pSystemVariables = ^SystemVariables;