paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 05:29:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: trunk@33984 -
This commit is contained in:
svenbarth 2016-06-14 12:18:36 +00:00
parent a72434e93a
commit 25c4a5c986
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rtl/inc/intres.inc
View File

@ -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;

6
rtl/inc/system.inc
View File

@ -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}