mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-17 10:39:09 +02:00
* Make sure it compiles with previous release
This commit is contained in:
parent
a7578e144d
commit
b2f2c5671c
@ -110,6 +110,10 @@ uses
|
|||||||
{$endif HAS_UNIT_ZIPPER}
|
{$endif HAS_UNIT_ZIPPER}
|
||||||
;
|
;
|
||||||
|
|
||||||
|
{$IF DECLARED(VOLATILE)}
|
||||||
|
{$DEFINE HAVE_VOLATILE}
|
||||||
|
{$ENDIF}
|
||||||
|
|
||||||
Type
|
Type
|
||||||
TFileType = (ftSource,ftUnit,ftObject,ftResource,ftExecutable,ftStaticLibrary,
|
TFileType = (ftSource,ftUnit,ftObject,ftResource,ftExecutable,ftStaticLibrary,
|
||||||
ftSharedLibrary);
|
ftSharedLibrary);
|
||||||
@ -7429,7 +7433,7 @@ begin
|
|||||||
{ prevent FCachedlibcPath getting freed by thread 2 while thread 1 is
|
{ prevent FCachedlibcPath getting freed by thread 2 while thread 1 is
|
||||||
concatenating it to -Fl below }
|
concatenating it to -Fl below }
|
||||||
try
|
try
|
||||||
if volatile(FCachedlibcPath)='' then
|
if {$IFDEF HAVE_VOLATILE}volatile{$ENDIF}(FCachedlibcPath)='' then
|
||||||
begin
|
begin
|
||||||
{$endif NO_THREADING}
|
{$endif NO_THREADING}
|
||||||
FCachedlibcPath:=s;
|
FCachedlibcPath:=s;
|
||||||
@ -7449,7 +7453,7 @@ begin
|
|||||||
{$ifdef NO_THREADING}
|
{$ifdef NO_THREADING}
|
||||||
Args.Add('-Fl'+FCachedlibcPath);
|
Args.Add('-Fl'+FCachedlibcPath);
|
||||||
{$ELSE}
|
{$ELSE}
|
||||||
Args.Add('-Fl'+volatile(FCachedlibcPath));
|
Args.Add('-Fl'+{$IFDEF HAVE_VOLATILE}volatile{$ENDIF}(FCachedlibcPath));
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user