paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-07-18 21:05:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

replaced NEW1_1 defines

Browse Source 
git-svn-id: trunk@4745 -
This commit is contained in:
mattias 2003-10-30 21:41:11 +00:00
parent 3564a2e914
commit 59bc0cb985
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/codetools/memcheck.pas
View File

@ -1368,10 +1368,10 @@ const
outputstr : shortstring = ''; outputstr : shortstring = '';
const const
NullCall = {$IFDEF NEW1_1}nil{$ELSE}0{$ENDIF}; NullCall = nil;
type type
TCall = {$IFDEF New1_1}pointer{$ELSE}longint{$ENDIF}; TCall = pointer;
pheap_extra_info = ^theap_extra_info; pheap_extra_info = ^theap_extra_info;
theap_extra_info = record theap_extra_info = record
@ -2567,6 +2567,9 @@ end.
{ {
$Log$ $Log$
Revision 1.24 2003/10/30 21:41:11 mattias
replaced NEW1_1 defines
Revision 1.23 2003/10/23 16:15:30 micha Revision 1.23 2003/10/23 16:15:30 micha
compatibility with new 1.1 compatibility with new 1.1

4
lcl/grids.pas
View File

@ -226,8 +226,8 @@ type
end; end;
type type
TGridCoord = {$IFNDEF NEW1_1}type{$ENDIF} TPoint; TGridCoord = {$IFNDEF VER1_1}type{$ENDIF} TPoint;
TGridRect = {$IFNDEF NEW1_1}type{$ENDIF} TRect; TGridRect = {$IFNDEF VER1_1}type{$ENDIF} TRect;
TGridDataCache=record TGridDataCache=record
FixedWidth: Integer; // Sum( Fixed ColsWidths[i] ) FixedWidth: Integer; // Sum( Fixed ColsWidths[i] )

10
lcl/utrace.pp
View File

@ -22,15 +22,7 @@ interface
uses sysutils; uses sysutils;
type type
// The fpc 1.0.x and the old 1.1 (older than January 2003) defines the TAssertErrorAddrType = {$IFDEF VER1_1}Pointer{$ELSE}Longint{$ENDIF};
// type of TheAddr as longint.
// The current fpc 1.1 defines it as pointer. There is no flag to distinguish
// the new from the old 1.1, so we have to define our own. Because the current
// 1.1 does not compile an expression in synedit and is much more unstable
// than the old 1.1, the old is the default for the 1.1 series.
// To compile the LCL with a current fpc, you have to add -dNEW1_1 to the
// options. i.e. add -dNEW1_1 to the build lazarus options.
TAssertErrorAddrType = {$IFDEF NEW1_1}Pointer{$ELSE}Longint{$ENDIF};
TAssertErrorProc = procedure(Const Msg,FN :ShortString; TAssertErrorProc = procedure(Const Msg,FN :ShortString;
LineNo: LongInt; TheAddr: TAssertErrorAddrType); LineNo: LongInt; TheAddr: TAssertErrorAddrType);