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

* Fixed compilation on WinCE after r17114 and r17094

Browse Source 
git-svn-id: trunk@17115 -
This commit is contained in:
joost 2011-03-10 19:03:00 +00:00
parent 1f1172e73e
commit b1dd2f8659
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/globals.pas
View File

@ -718,7 +718,7 @@ implementation
Default Macro Handling Default Macro Handling
****************************************************************************} ****************************************************************************}
{$ifdef windows} {$ifdef mswindows}
{ {
This code is copied from sysutils.pp This code is copied from sysutils.pp
} }
@ -784,11 +784,11 @@ implementation
Result:=IncludeTrailingPathDelimiter(StrPas(@APath[0])); Result:=IncludeTrailingPathDelimiter(StrPas(@APath[0]));
end; end;
end; end;
{$endif windows} {$endif mswindows}
procedure DefaultReplacements(var s:ansistring); procedure DefaultReplacements(var s:ansistring);
{$ifdef windows} {$ifdef mswindows}
procedure ReplaceSpecialFolder(const MacroName: string; const ID: integer); procedure ReplaceSpecialFolder(const MacroName: string; const ID: integer);
begin begin
// Only try to receive the special folders (and thus dynamically // Only try to receive the special folders (and thus dynamically
@ -797,7 +797,7 @@ implementation
Replace(s,MacroName,GetSpecialDir(ID)); Replace(s,MacroName,GetSpecialDir(ID));
end; end;
{$endif windows} {$endif mswindows}
var var
envstr: string; envstr: string;
envvalue: pchar; envvalue: pchar;
@ -813,7 +813,7 @@ implementation
Replace(s,'$FPCTARGET',target_os_string) Replace(s,'$FPCTARGET',target_os_string)
else else
Replace(s,'$FPCTARGET',target_full_string); Replace(s,'$FPCTARGET',target_full_string);
{$ifdef windows} {$ifdef mswindows}
ReplaceSpecialFolder('$LOCAL_APPDATA',CSIDL_LOCAL_APPDATA); ReplaceSpecialFolder('$LOCAL_APPDATA',CSIDL_LOCAL_APPDATA);
ReplaceSpecialFolder('$APPDATA',CSIDL_APPDATA); ReplaceSpecialFolder('$APPDATA',CSIDL_APPDATA);
ReplaceSpecialFolder('$COMMON_APPDATA',CSIDL_COMMON_APPDATA); ReplaceSpecialFolder('$COMMON_APPDATA',CSIDL_COMMON_APPDATA);
@ -821,7 +821,7 @@ implementation
ReplaceSpecialFolder('$PROGRAM_FILES',CSIDL_PROGRAM_FILES); ReplaceSpecialFolder('$PROGRAM_FILES',CSIDL_PROGRAM_FILES);
ReplaceSpecialFolder('$PROGRAM_FILES_COMMON',CSIDL_PROGRAM_FILES_COMMON); ReplaceSpecialFolder('$PROGRAM_FILES_COMMON',CSIDL_PROGRAM_FILES_COMMON);
ReplaceSpecialFolder('$PROFILE',CSIDL_PROFILE); ReplaceSpecialFolder('$PROFILE',CSIDL_PROFILE);
{$endif windows} {$endif mswindows}
{ Replace environment variables between dollar signs } { Replace environment variables between dollar signs }
i := pos('$',s); i := pos('$',s);
while i>0 do while i>0 do
@ -1581,10 +1581,10 @@ implementation
features:=[low(Tfeature)..high(Tfeature)]; features:=[low(Tfeature)..high(Tfeature)];
end; end;
{$ifdef windows} {$ifdef mswindows}
initialization initialization
finalization finalization
if CFGDLLHandle<>0 then if CFGDLLHandle<>0 then
FreeLibrary(CFGDllHandle); FreeLibrary(CFGDllHandle);
{$endif windows} {$endif mswindows}
end. end.