From 6b45e73d463d720d7e9e84ba461aaa75a30c25c6 Mon Sep 17 00:00:00 2001
From: dkolmck <dkolmck@91bb2d04-0c0c-4d2d-88a5-bbb6f4c1fa07>
Date: Wed, 18 Jan 2017 07:58:04 +0000
Subject: [PATCH] * fix compatibility with FPC 3.0 (Thaddy)

git-svn-id: https://svn.code.sf.net/p/kolmck/code@155 91bb2d04-0c0c-4d2d-88a5-bbb6f4c1fa07
---
 KOLDEF.inc | 473 +++++++++++++++++++++++++++--------------------------
 1 file changed, 243 insertions(+), 230 deletions(-)

diff --git a/KOLDEF.inc b/KOLDEF.inc
index bd810fb..beb1568 100644
--- a/KOLDEF.inc
+++ b/KOLDEF.inc
@@ -1,107 +1,107 @@
 {$IFDEF VER90}
-	{$DEFINE _D2}
-	{$DEFINE _D2orD3}
-	{$DEFINE _D2orD3orD4}
+  {$DEFINE _D2}
+  {$DEFINE _D2orD3}
+  {$DEFINE _D2orD3orD4}
 {$ENDIF}
 
 {$IFDEF VER100}
-	{$DEFINE _D3}
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D2orD3}
-	{$DEFINE _D2orD3orD4}
-	{$DEFINE _D3orD4}
+  {$DEFINE _D3}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D2orD3}
+  {$DEFINE _D2orD3orD4}
+  {$DEFINE _D3orD4}
 {$ENDIF}
 
 {$IFDEF VER120}
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D3orD4}
-	{$DEFINE _D4}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D2orD3orD4}
-	{$IFnDEF KOL_MCK}
-		{$DEFINE INPACKAGE}
-	{$ENDIF}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D3orD4}
+  {$DEFINE _D4}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D2orD3orD4}
+  {$IFnDEF KOL_MCK}
+    {$DEFINE INPACKAGE}
+  {$ENDIF}
 {$ENDIF}
 
 {$IFDEF VER130}
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5}
-	{$DEFINE _D5orHigher}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5}
+  {$DEFINE _D5orHigher}
 {$ENDIF}
 
 {$IFDEF VER140}
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6}
-	{$DEFINE _D6orHigher}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6}
+  {$DEFINE _D6orHigher}
 {$ENDIF}
 
 {$IFDEF VER150}
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7}
-	{$DEFINE _D7orHigher}
-	{$WARN UNIT_DEPRECATED OFF}
-	{$WARN SYMBOL_PLATFORM OFF}
-	{$WARN UNSAFE_TYPE OFF}
-	{$WARN UNSAFE_CAST OFF}
-	{$WARN UNSAFE_CODE OFF}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7}
+  {$DEFINE _D7orHigher}
+  {$WARN UNIT_DEPRECATED OFF}
+  {$WARN SYMBOL_PLATFORM OFF}
+  {$WARN UNSAFE_TYPE OFF}
+  {$WARN UNSAFE_CAST OFF}
+  {$WARN UNSAFE_CODE OFF}
 {$ENDIF}
 
 {$IFDEF VER160} // Delphi 8
-	Delphi version 8 not supported! (delphi 8 is .net only)
+  Delphi version 8 not supported! (delphi 8 is .net only)
 {$ENDIF}
 
 {$IFDEF VER170} // Delphi 2005
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D8}
-	{$DEFINE _D8orHigher}
-	{$DEFINE _D2005}
-	{$DEFINE _D2005orHigher}
-	{$WARN UNIT_DEPRECATED OFF}
-	{$WARN SYMBOL_PLATFORM OFF}
-	{$WARN UNSAFE_TYPE OFF}
-	{$WARN UNSAFE_CAST OFF}
-	{$WARN UNSAFE_CODE OFF}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D8}
+  {$DEFINE _D8orHigher}
+  {$DEFINE _D2005}
+  {$DEFINE _D2005orHigher}
+  {$WARN UNIT_DEPRECATED OFF}
+  {$WARN SYMBOL_PLATFORM OFF}
+  {$WARN UNSAFE_TYPE OFF}
+  {$WARN UNSAFE_CAST OFF}
+  {$WARN UNSAFE_CODE OFF}
 {$ENDIF}
 
 {$IFDEF VER180} // Delphi 2006
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D8orHigher}
-	{$DEFINE _D2005}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$WARN UNIT_DEPRECATED OFF}
-	{$WARN SYMBOL_PLATFORM OFF}
-	{$WARN UNSAFE_TYPE OFF}
-	{$WARN UNSAFE_CAST OFF}
-	{$WARN UNSAFE_CODE OFF}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D8orHigher}
+  {$DEFINE _D2005}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$WARN UNIT_DEPRECATED OFF}
+  {$WARN SYMBOL_PLATFORM OFF}
+  {$WARN UNSAFE_TYPE OFF}
+  {$WARN UNSAFE_CAST OFF}
+  {$WARN UNSAFE_CODE OFF}
 {$ENDIF}
 
 {$IFDEF _D2005orHigher}
   // by Thaddy de Koning:
   {$IFDEF VER185} // Delphi 2007 ( and Highlander )
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$DEFINE _D2007}
-	{$DEFINE _D2007orHigher}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$DEFINE _D2007}
+  {$DEFINE _D2007orHigher}
     {$WARN UNIT_DEPRECATED OFF}
     {$WARN SYMBOL_PLATFORM OFF}
     {$WARN UNSAFE_TYPE OFF}
@@ -130,172 +130,172 @@
 {$ENDIF}
 
 {$IFDEF VER210} // Delphi 2010
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$DEFINE _D2007orHigher}
-	{$DEFINE _D2009orHigher}
-	{$DEFINE _D2010}
-	{$DEFINE _D2010orHigher}
-	{$WARN UNIT_DEPRECATED OFF}
-	{$WARN SYMBOL_PLATFORM OFF}
-	{$WARN UNSAFE_TYPE OFF}
-	{$WARN UNSAFE_CAST OFF}
-	{$WARN UNSAFE_CODE OFF}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$DEFINE _D2007orHigher}
+  {$DEFINE _D2009orHigher}
+  {$DEFINE _D2010}
+  {$DEFINE _D2010orHigher}
+  {$WARN UNIT_DEPRECATED OFF}
+  {$WARN SYMBOL_PLATFORM OFF}
+  {$WARN UNSAFE_TYPE OFF}
+  {$WARN UNSAFE_CAST OFF}
+  {$WARN UNSAFE_CODE OFF}
 {$ENDIF}
 
 {$IFDEF VER220} // Delphi XE
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$DEFINE _D2007orHigher}
-	{$DEFINE _D2009orHigher}
-	{$DEFINE _D2010orHigher}
-	{$DEFINE _DXE}
-	{$DEFINE _DXEorHigher}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$DEFINE _D2007orHigher}
+  {$DEFINE _D2009orHigher}
+  {$DEFINE _D2010orHigher}
+  {$DEFINE _DXE}
+  {$DEFINE _DXEorHigher}
     {$WARN UNIT_DEPRECATED OFF}
-	{$WARN SYMBOL_PLATFORM OFF}
-	{$WARN UNSAFE_TYPE OFF}
-	{$WARN UNSAFE_CAST OFF}
-	{$WARN UNSAFE_CODE OFF}
+  {$WARN SYMBOL_PLATFORM OFF}
+  {$WARN UNSAFE_TYPE OFF}
+  {$WARN UNSAFE_CAST OFF}
+  {$WARN UNSAFE_CODE OFF}
 {$ENDIF}
 
 {$IFDEF VER230} // Delphi XE2
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$DEFINE _D2007orHigher}
-	{$DEFINE _D2009orHigher}
-	{$DEFINE _D2010orHigher}
-	{$DEFINE _DXEorHigher}
-	{$DEFINE _DXE2}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$DEFINE _D2007orHigher}
+  {$DEFINE _D2009orHigher}
+  {$DEFINE _D2010orHigher}
+  {$DEFINE _DXEorHigher}
+  {$DEFINE _DXE2}
     {$DEFINE _DXE2orHigher}
     {$IFDEF WIN64}
       {$DEFINE PAS_VERSION}
       {$DEFINE PAS_ONLY}
-	  {.$DEFINE UNICODE_CTRLS}
-	  {$DEFINE STREAM_LARGE64}
+    {.$DEFINE UNICODE_CTRLS}
+    {$DEFINE STREAM_LARGE64}
     {$ENDIF}
     {$WARN UNIT_DEPRECATED OFF}
-	{.$WARN SYMBOL_PLATFORM OFF}
-	{.$WARN UNSAFE_TYPE OFF}
-	{.$WARN UNSAFE_CAST OFF}
-	{.$WARN UNSAFE_CODE OFF}
+  {.$WARN SYMBOL_PLATFORM OFF}
+  {.$WARN UNSAFE_TYPE OFF}
+  {.$WARN UNSAFE_CAST OFF}
+  {.$WARN UNSAFE_CODE OFF}
 {$ENDIF}
 
 {$IFDEF VER240} // Delphi XE3
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$DEFINE _D2007orHigher}
-	{$DEFINE _D2009orHigher}
-	{$DEFINE _D2010orHigher}
-	{$DEFINE _DXEorHigher}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$DEFINE _D2007orHigher}
+  {$DEFINE _D2009orHigher}
+  {$DEFINE _D2010orHigher}
+  {$DEFINE _DXEorHigher}
     {$DEFINE _DXE2orHigher}
-	{$DEFINE _DXE3}
+  {$DEFINE _DXE3}
     {$DEFINE _DXE3orHigher}
     {$IFDEF WIN64}
       {$DEFINE PAS_VERSION}
       {$DEFINE PAS_ONLY}
-	  {.$DEFINE UNICODE_CTRLS}
-	  {$DEFINE STREAM_LARGE64}
+    {.$DEFINE UNICODE_CTRLS}
+    {$DEFINE STREAM_LARGE64}
     {$ENDIF}
     {$WARN UNIT_DEPRECATED OFF}
-	{.$WARN SYMBOL_PLATFORM OFF}
-	{.$WARN UNSAFE_TYPE OFF}
-	{.$WARN UNSAFE_CAST OFF}
-	{.$WARN UNSAFE_CODE OFF}
+  {.$WARN SYMBOL_PLATFORM OFF}
+  {.$WARN UNSAFE_TYPE OFF}
+  {.$WARN UNSAFE_CAST OFF}
+  {.$WARN UNSAFE_CODE OFF}
 {$ENDIF}
 
 {$IFDEF VER250} // Delphi XE4
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$DEFINE _D2007orHigher}
-	{$DEFINE _D2009orHigher}
-	{$DEFINE _D2010orHigher}
-	{$DEFINE _DXEorHigher}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$DEFINE _D2007orHigher}
+  {$DEFINE _D2009orHigher}
+  {$DEFINE _D2010orHigher}
+  {$DEFINE _DXEorHigher}
     {$DEFINE _DXE2orHigher}
     {$DEFINE _DXE3orHigher}
-	{$DEFINE _DXE4}
+  {$DEFINE _DXE4}
     {$DEFINE _DXE4orHigher}
     {$IFDEF WIN64}
       {$DEFINE PAS_VERSION}
       {$DEFINE PAS_ONLY}
-	  {.$DEFINE UNICODE_CTRLS}
-	  {$DEFINE STREAM_LARGE64}
+    {.$DEFINE UNICODE_CTRLS}
+    {$DEFINE STREAM_LARGE64}
     {$ENDIF}
     {$WARN UNIT_DEPRECATED OFF}
-	{.$WARN SYMBOL_PLATFORM OFF}
-	{.$WARN UNSAFE_TYPE OFF}
-	{.$WARN UNSAFE_CAST OFF}
-	{.$WARN UNSAFE_CODE OFF}
+  {.$WARN SYMBOL_PLATFORM OFF}
+  {.$WARN UNSAFE_TYPE OFF}
+  {.$WARN UNSAFE_CAST OFF}
+  {.$WARN UNSAFE_CODE OFF}
     {$DEFINE TMSG_WINDOWS}
 {$ENDIF}
 
 {$IFDEF VER260} // Delphi XE5
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$DEFINE _D2007orHigher}
-	{$DEFINE _D2009orHigher}
-	{$DEFINE _D2010orHigher}
-	{$DEFINE _DXEorHigher}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$DEFINE _D2007orHigher}
+  {$DEFINE _D2009orHigher}
+  {$DEFINE _D2010orHigher}
+  {$DEFINE _DXEorHigher}
     {$DEFINE _DXE2orHigher}
     {$DEFINE _DXE3orHigher}
     {$DEFINE _DXE4orHigher}
-	{$DEFINE _DXE5}
+  {$DEFINE _DXE5}
     {$DEFINE _DXE5orHigher}
     {$IFDEF WIN64}
       {$DEFINE PAS_VERSION}
       {$DEFINE PAS_ONLY}
-	  {.$DEFINE UNICODE_CTRLS}
-	  {$DEFINE STREAM_LARGE64}
+    {.$DEFINE UNICODE_CTRLS}
+    {$DEFINE STREAM_LARGE64}
     {$ENDIF}
    {$WARN UNIT_DEPRECATED OFF}
-	{.$WARN SYMBOL_PLATFORM OFF}
-	{.$WARN UNSAFE_TYPE OFF}
-	{.$WARN UNSAFE_CAST OFF}
-	{.$WARN UNSAFE_CODE OFF}
+  {.$WARN SYMBOL_PLATFORM OFF}
+  {.$WARN UNSAFE_TYPE OFF}
+  {.$WARN UNSAFE_CAST OFF}
+  {.$WARN UNSAFE_CODE OFF}
     {$DEFINE TMSG_WINDOWS}
 {$ENDIF}
 
 {$IFDEF VER270} // Delphi XE6
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$DEFINE _D2007orHigher}
-	{$DEFINE _D2009orHigher}
-	{$DEFINE _D2010orHigher}
-	{$DEFINE _DXEorHigher}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$DEFINE _D2007orHigher}
+  {$DEFINE _D2009orHigher}
+  {$DEFINE _D2010orHigher}
+  {$DEFINE _DXEorHigher}
     {$DEFINE _DXE2orHigher}
     {$DEFINE _DXE3orHigher}
     {$DEFINE _DXE4orHigher}
@@ -305,29 +305,29 @@
     {$IFDEF WIN64}
       {$DEFINE PAS_VERSION}
       {$DEFINE PAS_ONLY}
-	  {.$DEFINE UNICODE_CTRLS}
-	  {$DEFINE STREAM_LARGE64}
+    {.$DEFINE UNICODE_CTRLS}
+    {$DEFINE STREAM_LARGE64}
     {$ENDIF}
    {$WARN UNIT_DEPRECATED OFF}
-	{.$WARN SYMBOL_PLATFORM OFF}
-	{.$WARN UNSAFE_TYPE OFF}
-	{.$WARN UNSAFE_CAST OFF}
-	{.$WARN UNSAFE_CODE OFF}
+  {.$WARN SYMBOL_PLATFORM OFF}
+  {.$WARN UNSAFE_TYPE OFF}
+  {.$WARN UNSAFE_CAST OFF}
+  {.$WARN UNSAFE_CODE OFF}
     {$DEFINE TMSG_WINDOWS}
 {$ENDIF}
 
 {$IFDEF VER280} // Delphi XE7
-	{$DEFINE _D3orHigher}
-	{$DEFINE _D4orHigher}
-	{$DEFINE _D5orHigher}
-	{$DEFINE _D6orHigher}
-	{$DEFINE _D7orHigher}
-	{$DEFINE _D2005orHigher}
-	{$DEFINE _D2006orHigher}
-	{$DEFINE _D2007orHigher}
-	{$DEFINE _D2009orHigher}
-	{$DEFINE _D2010orHigher}
-	{$DEFINE _DXEorHigher}
+  {$DEFINE _D3orHigher}
+  {$DEFINE _D4orHigher}
+  {$DEFINE _D5orHigher}
+  {$DEFINE _D6orHigher}
+  {$DEFINE _D7orHigher}
+  {$DEFINE _D2005orHigher}
+  {$DEFINE _D2006orHigher}
+  {$DEFINE _D2007orHigher}
+  {$DEFINE _D2009orHigher}
+  {$DEFINE _D2010orHigher}
+  {$DEFINE _DXEorHigher}
     {$DEFINE _DXE2orHigher}
     {$DEFINE _DXE3orHigher}
     {$DEFINE _DXE4orHigher}
@@ -338,14 +338,14 @@
     {$IFDEF WIN64}
       {$DEFINE PAS_VERSION}
       {$DEFINE PAS_ONLY}
-	  {.$DEFINE UNICODE_CTRLS}
-	  {$DEFINE STREAM_LARGE64}
+    {.$DEFINE UNICODE_CTRLS}
+    {$DEFINE STREAM_LARGE64}
     {$ENDIF}
    {$WARN UNIT_DEPRECATED OFF}
-	{.$WARN SYMBOL_PLATFORM OFF}
-	{.$WARN UNSAFE_TYPE OFF}
-	{.$WARN UNSAFE_CAST OFF}
-	{.$WARN UNSAFE_CODE OFF}
+  {.$WARN SYMBOL_PLATFORM OFF}
+  {.$WARN UNSAFE_TYPE OFF}
+  {.$WARN UNSAFE_CAST OFF}
+  {.$WARN UNSAFE_CODE OFF}
     {$DEFINE TMSG_WINDOWS}
 {$ENDIF}
 
@@ -360,26 +360,39 @@
 {$ENDIF}
 
 {$IFDEF FPC}
-{$DEFINE PAS_ONLY}
-{$DEFINE USE_OLD_FLAGS} //size of set type in fpc is 4 bytes
-{------------------------------------
-by Thaddy de Koning:
+  {$DEFINE PAS_ONLY}
+  {$DEFINE USE_OLD_FLAGS} //size of set type in fpc is 4 bytes
+  {------------------------------------
+  by Thaddy de Koning:
 
-FPC version 2.1.1 is very compatible with Delphi and kol now.
-You can simply use the $(DELPHI)\source\rtl\win\*.pas files from Delphi 4/5 instead of the prepared files that were needed for 
-FPC1.X
+  FPC version 2.1.1 is very compatible with Delphi and kol now.
+  You can simply use the $(DELPHI)\source\rtl\win\*.pas files from Delphi 4/5 instead of the prepared files that were needed for
+  FPC1.X
 
-That is all to have full compatibility.
-------------------------------------}
-{$DEFINE PAS_VERSION}
-{$IFDEF VER2}
- {$DEFINE _D3orHigher}
- {$DEFINE _D4orHigher}
- {$DEFINE _D5orHigher}
- {$DEFINE _D6orHigher}
- {$DEFINE _D7}
- {$DEFINE _D7orHigher}
-{$ENDIF}
+  That is all to have full compatibility.
+  ------------------------------------}
+  {$DEFINE PAS_VERSION}
+  {$IFDEF VER2}
+    {$DEFINE _D3orHigher}
+    {$DEFINE _D4orHigher}
+    {$DEFINE _D5orHigher}
+    {$DEFINE _D6orHigher}
+    {$DEFINE _D7}
+    {$DEFINE _D7orHigher}
+  {$ENDIF}
+  {$IFDEF VER3}
+    // I should clean this up later.
+    {$DEFINE VER2}
+    {$DEFINE _D3orHigher}
+    {$DEFINE _D4orHigher}
+    {$DEFINE _D5orHigher}
+    {$DEFINE _D6orHigher}
+    {$DEFINE _D7}
+    {$DEFINE _D7orHigher}
+    {$DEFINE _D2005orHigher}
+    {$DEFINE _D2006orHigher}
+    {$DEFINE _D2007orHigher}
+  {$ENDIF}
 {$ENDIF FPC}
 
 {$IFNDEF _NOT_KOLCtrlWrapper_}