From 25c4a5c986ee1c549c035f50a986f3ec7c7ae6e3 Mon Sep 17 00:00:00 2001
From: svenbarth <pascaldragon@googlemail.com>
Date: Tue, 14 Jun 2016 12:18:36 +0000
Subject: [PATCH] Fix usage of external resources on systems besides Darwin by
 moving the variable referencing FPC_RESLOCATION fon non-indirect entry
 information systems from system.inc back into intres.inc

git-svn-id: trunk@33984 -
---
 rtl/inc/intres.inc | 5 +++++
 rtl/inc/system.inc | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/rtl/inc/intres.inc b/rtl/inc/intres.inc
index 10efe8728c..cceda6b54e 100644
--- a/rtl/inc/intres.inc
+++ b/rtl/inc/intres.inc
@@ -34,7 +34,12 @@ type
 
 var
 {$ifdef FPC_HAS_WINLIKERESOURCES}
+{$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}
   ResHeader : PPResHdr; external name '_FPC_ResLocation';
+{$else}
+  ResHeaderVar: PResHdr; external name 'FPC_RESLOCATION';
+  ResHeader : PPResHdr = @ResHeaderVar;
+{$endif}
 {$else}
   ResHeaderVar : PResHdr = nil;
   ResHeader : PPResHdr= @ResHeaderVar;
diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc
index f07026857d..bf8ef5cf13 100644
--- a/rtl/inc/system.inc
+++ b/rtl/inc/system.inc
@@ -119,12 +119,6 @@ var
 {$endif FPC_HAS_RESSTRINITS}
   FPCResourceStringTablesVar : record end; External Name 'FPC_RESOURCESTRINGTABLES';
   FPCResourceStringTables : Pointer = @FPCResourceStringTablesVar;public name '_FPC_ResourceStringTables';
-{$if defined(FPC_HAS_WINLIKERESOURCES) and not defined(WINDOWS)}
-  FPCResLocationVar: record end; external name 'FPC_RESLOCATION';
-{$else FPC_HAS_WINLIKERESOURCES and not WINDOWS}
-  FPCResLocationVar : Pointer = Nil;
-{$endif FPC_HAS_WINLIKERESOURCES and not WINDOWS}
-  FPCResLocation : Pointer = @FPCResLocationVar;public name '_FPC_ResLocation';
 {$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
 
 {$ifdef FPC_HAS_INDIRECT_ENTRY_INFORMATION}