Переглянути джерело

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 -
svenbarth 9 роки тому
батько
коміт
25c4a5c986
2 змінених файлів з 5 додано та 6 видалено
  1. 5 0
      rtl/inc/intres.inc
  2. 0 6
      rtl/inc/system.inc

+ 5 - 0
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;

+ 0 - 6
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}