diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-08-04 09:17:05 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-08-04 09:17:05 +0000 |
commit | 1b2666d51b63812e1d77eb1fc54f7b2d2a1f0d37 (patch) | |
tree | b702b47152793c54f363cfcd7916fb0dfaa66829 /rtl | |
parent | 7eea27cd65f76adc39a1274819ec7ce924d0a355 (diff) | |
download | fpc-1b2666d51b63812e1d77eb1fc54f7b2d2a1f0d37.tar.gz |
--- Merging r31033 into '.':
C rtl/inc/system.fpd
--- Recording mergeinfo for merge of r31033 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31033
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@31275 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'rtl')
-rw-r--r-- | rtl/inc/system.fpd | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rtl/inc/system.fpd b/rtl/inc/system.fpd index 59a8c2802d..ee039cc2c8 100644 --- a/rtl/inc/system.fpd +++ b/rtl/inc/system.fpd @@ -25,6 +25,9 @@ Type Smallint= -32768 .. 32767; Word = 0 .. 65535; WideChar= #$0000..#$FFFF; + UnicodeString = UnicodeString; + WideString = WideString; + Function Addr (X : TAnytype) : Pointer; Procedure Assert(Expr : Boolean); Procedure Assert(Expr : Boolean; const Msg : string); @@ -80,7 +83,8 @@ Procedure Fail; Function TypeOf(T : TObjectType) : Pointer; Procedure Initialize(Var T : TAnyType; ACount : Integer = 1); Procedure Finalize(Var T : TAnyType; ACount : Integer = 1); - +Function Default(Const T : AnyType) : AnyType; + {$IFNDEF GO32V2} Var mem : array[0..$7fffffff-1] of byte; |