Browse Source

Fix compilation of Win64 and WinCE as those don't have indirect entry information yet and thus they'd require FPC_RESLOCATION which is not available for those platforms... Fixes Mantis #30264.

git-svn-id: trunk@33982 -
svenbarth 9 years ago
parent
commit
7f079ff58a
1 changed files with 3 additions and 3 deletions
  1. 3 3
      rtl/inc/system.inc

+ 3 - 3
rtl/inc/system.inc

@@ -119,11 +119,11 @@ var
 {$endif FPC_HAS_RESSTRINITS}
 {$endif FPC_HAS_RESSTRINITS}
   FPCResourceStringTablesVar : record end; External Name 'FPC_RESOURCESTRINGTABLES';
   FPCResourceStringTablesVar : record end; External Name 'FPC_RESOURCESTRINGTABLES';
   FPCResourceStringTables : Pointer = @FPCResourceStringTablesVar;public name '_FPC_ResourceStringTables';
   FPCResourceStringTables : Pointer = @FPCResourceStringTablesVar;public name '_FPC_ResourceStringTables';
-{$ifdef FPC_HAS_WINLIKERESOURCES}
+{$if defined(FPC_HAS_WINLIKERESOURCES) and not defined(WINDOWS)}
   FPCResLocationVar: record end; external name 'FPC_RESLOCATION';
   FPCResLocationVar: record end; external name 'FPC_RESLOCATION';
-{$else FPC_HAS_WINLIKERESOURCES}
+{$else FPC_HAS_WINLIKERESOURCES and not WINDOWS}
   FPCResLocationVar : Pointer = Nil;
   FPCResLocationVar : Pointer = Nil;
-{$endif FPC_HAS_WINLIKERESOURCES}
+{$endif FPC_HAS_WINLIKERESOURCES and not WINDOWS}
   FPCResLocation : Pointer = @FPCResLocationVar;public name '_FPC_ResLocation';
   FPCResLocation : Pointer = @FPCResLocationVar;public name '_FPC_ResLocation';
 {$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}
 {$endif FPC_HAS_INDIRECT_ENTRY_INFORMATION}