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

* revs 43341 (Solaris makefile) ,43971 (ismanagedtype usage 3.2.x ifdef in

Browse Source 
fgl)

git-svn-id: branches/fixes_3_2@44091 -
This commit is contained in:
marco 2020-02-02 14:12:42 +00:00
parent cbe9654b04
commit 1bf341f0ff
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/objpas/fgl.pp
View File

@ -970,14 +970,10 @@ end;
class function TFPGList.ItemIsManaged: Boolean; class function TFPGList.ItemIsManaged: Boolean;
begin begin
{$IFNDEF VER3_0} {$IFNDEF VER3_0}
{$IFNDEF VER3_2}
Result:=IsManagedType(T); Result:=IsManagedType(T);
{$ELSE} {$ELSE}
Result:=True; // Fallback to old behaviour Result:=True; // Fallback to old behaviour
{$ENDIF} {$ENDIF}
{$ELSE}
Result:=True; // Fallback to old behaviour
{$ENDIF}
end; end;
function TFPGList.GetEnumerator: TFPGListEnumeratorSpec; function TFPGList.GetEnumerator: TFPGListEnumeratorSpec;

6
rtl/solaris/Makefile
View File

@ -2937,9 +2937,11 @@ character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT)
macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
$(COMPILER) $(INC)/macpas.pp $(REDIR) $(COMPILER) $(INC)/macpas.pp $(REDIR)
ifneq ($(findstring $(ARCH),x86_64 i386),) ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) objpas$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
else else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
endif endif
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/mmx.pp $(COMPILER) $(PROCINC)/mmx.pp

6
rtl/solaris/Makefile.fpc
View File

@ -221,9 +221,11 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
# #
ifneq ($(findstring $(ARCH),x86_64 i386),) ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) objpas$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
else else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
endif endif
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)