-ctypes cleanup, it was quite a mess with naming conventions, eg. some times shortened long to l like cldouble

-long is written out now, while signed and unsigned are shortened to s and u

git-svn-id: trunk@4647 -
This commit is contained in:
ivost 2006-09-18 21:41:08 +00:00
parent d4e1612fd1
commit 23e1ebb357
3 changed files with 108 additions and 165 deletions

View File

@ -23,78 +23,53 @@ interface
uses unixtype; uses unixtype;
{$i aliasctp.inc} {$i aliasctp.inc}
{$else} {$else}
type
{ the following type definitions are compiler dependant }
{ and system dependant }
cint8 = shortint; pcint8 = ^cint8;
cuint8 = byte; pcuint8 = ^cuint8;
cchar = cint8; pcchar = ^cchar;
cschar = cint8; pcschar = ^cschar;
cuchar = cuint8; pcuchar = ^cuchar;
Type cint16 = smallint; pcint16 = ^cint16;
{ the following type definitions are compiler dependant } cuint16 = word; pcuint16 = ^cuint16;
{ and system dependant } cshort = cint16; pcshort = ^cshort;
csshort = cint16; pcsshort = ^csshort;
cushort = cuint16; pcushort = ^cushort;
cint8 = shortint; cint32 = longint; pcint32 = ^cint32;
cuint8 = byte; cuint32 = longword; pcuint32 = ^cuint32;
cuint16 = word; cint = cint32; pcint = ^cint; { minimum range is : 32-bit }
cint16 = smallint; csint = cint32; pcsint = ^csint; { minimum range is : 32-bit }
cint32 = longint; cuint = cuint32; pcuint = ^cuint; { minimum range is : 32-bit }
cuint32 = cardinal; csigned = cint; pcsigned = ^csigned;
cint64 = int64; cunsigned = cuint; pcunsigned = ^cunsigned;
cuint64 = qword;
cbool = longbool; cint64 = int64; pcint64 = ^cint64;
cchar = shortint; cuint64 = qword; pcuint64 = ^cuint64;
cuchar = byte; clonglong = cint64; pclonglong = ^clonglong;
cint = longint; { minimum range is : 32-bit } cslonglong = cint64; pcslonglong = ^cslonglong;
cuint = cardinal; { minimum range is : 32-bit } culonglong = cuint64; pculonglong = ^culonglong;
csint = cint;
csigned = cint;
cunsigned = cuint;
cbool = longbool; pcbool = ^cbool;
{$ifdef cpu64} {$ifdef cpu64}
clong = int64; clong = int64; pclong = ^clong;
culong = qword; cslong = int64; pcslong = ^cslong;
culong = qword; pculong = ^culong;
{$else} {$else}
clong = longint; clong = longint; pclong = ^clong;
culong = cardinal; cslong = longint; pcslong = ^cslong;
culong = cardinal; pculong = ^culong;
{$endif} {$endif}
clonglong = int64;
culonglong = qword;
cshort = smallint;
cushort = word;
pcint8 = ^cint8;
pcuint8 = ^cuint8;
pcint16 = ^cint16;
pcuint16 = ^cuint16;
pcint32 = ^cint32;
pcuint32 = ^cuint32;
pcint64 = ^cint64;
pcuint64 = ^cuint64;
pcbool = ^cbool;
pcchar = ^cchar;
pcuchar = ^cuchar;
pcint = ^cint;
pcuint = ^cuint;
pcsint = ^csint;
pcsigned = ^csigned;
pcunsigned = ^cunsigned;
pclong = ^clong;
pculong = ^culong;
pcshort = ^cshort;
pcushort = ^cushort;
{ Floating point } cfloat = single; pcfloat = ^cfloat;
cfloat = single; cdouble = double; pcdouble = ^cdouble;
cdouble = double; clongdouble = extended; pclongdouble = ^clongdouble;
cldouble = extended;
pcfloat = ^cfloat;
pcdouble = ^cdouble;
pcldouble = ^cldouble;
{$endif} {$endif}
// Kylix compat types
u_long = culong;
u_short = cushort;
implementation implementation
end. end.

View File

@ -15,54 +15,40 @@
**********************************************************************} **********************************************************************}
Type type
cInt8 = UnixType.cInt8; cint8 = UnixType.cint8; pcint8 = UnixType.pcint8;
cUInt8 = UnixType.cUInt8; cuint8 = UnixType.cuint8; pcuint8 = UnixType.pcuint8;
cUInt16 = UnixType.cUInt16; cchar = UnixType.cchar; pcchar = UnixType.pcchar;
cInt16 = UnixType.cInt16; cschar = UnixType.cschar; pcschar = UnixType.pcschar;
cInt32 = UnixType.cInt32; cuchar = UnixType.cuchar; pcuchar = UnixType.pcuchar;
cUInt32 = UnixType.cUInt32;
cInt64 = UnixType.cInt64;
cUInt64 = UnixType.cUInt64;
cuchar = UnixType.cuchar;
cchar = UnixType.cchar;
cInt = UnixType.cInt;
cUInt = UnixType.cUInt;
cLong = UnixType.cLong;
cuLong = UnixType.cuLong;
cshort = UnixType.cshort;
cushort = UnixType.cushort;
csint = UnixType.csint;
csigned = UnixType.csigned;
cunsigned = UnixType.cunsigned;
cbool = UnixType.cbool;
pcint8 = UnixType.pcint8; cint16 = UnixType.cint16; pcint16 = UnixType.pcint16;
pcuint8 = UnixType.pcuint8; cuint16 = UnixType.cuint16; pcuint16 = UnixType.pcuint16;
pcint16 = UnixType.pcint16; cshort = UnixType.cshort; pcshort = UnixType.pcshort;
pcuint16= UnixType.pcuint16; csshort = UnixType.csshort; pcsshort = UnixType.pcsshort;
pcint32 = UnixType.pcint32; cushort = UnixType.cushort; pcushort = UnixType.pcushort;
pcuint32= UnixType.pcuint32;
pcint64 = UnixType.pcint64;
pcuint64= UnixType.pcuint64;
pcuchar = UnixType.pcuchar;
pcchar = UnixType.pcchar;
pcInt = UnixType.pcInt;
pcUInt = UnixType.pcUInt;
pcLong = UnixType.pcLong;
pculong = UnixType.pculong;
pcshort = UnixType.pcshort;
pcushort= UnixType.pcushort;
pcsint = UnixType.pcsint;
pcsigned = UnixType.pcsigned;
pcunsigned = UnixType.pcunsigned;
pcbool = UnixType.pcbool;
{ Floating point } cint32 = UnixType.cint32; pcint32 = UnixType.pcint32;
cFloat = UnixType.cFloat; cuint32 = UnixType.cuint32; pcuint32 = UnixType.pcuint32;
cDouble = UnixType.cDouble; cint = UnixType.cint; pcint = UnixType.pcint;
clDouble = UnixType.clDouble; csint = UnixType.csint; pcsint = UnixType.pcsint;
pcFloat = UnixType.pcFloat; cuint = UnixType.cuint; pcuint = UnixType.pcuint;
pcDouble = UnixType.pcDouble; csigned = UnixType.csigned; pcsigned = UnixType.pcsigned;
pclDouble = UnixType.pclDouble; cunsigned = UnixType.cunsigned; pcunsigned = UnixType.pcunsigned;
cint64 = UnixType.cint64; pcint64 = UnixType.pcint64;
cuint64 = UnixType.cuint64; pcuint64 = UnixType.pcuint64;
clonglong = UnixType.clonglong; pclonglong = UnixType.pclonglong;
cslonglong = UnixType.cslonglong; pcslonglong = UnixType.pcslonglong;
culonglong = UnixType.culonglong; pculonglong = UnixType.pculonglong;
cbool = UnixType.cbool; pcbool = UnixType.pcbool;
clong = UnixType.clong; pclong = UnixType.pclong;
cslong = UnixType.cslong; pcslong = UnixType.pcslong;
culong = UnixType.culong; pculong = UnixType.pculong;
cfloat = UnixType.cfloat; pcfloat = UnixType.pcfloat;
cdouble = UnixType.cdouble; pcdouble = UnixType.pcdouble;
clongdouble = UnixType.clongdouble; pclongdouble = UnixType.pclongdouble;

View File

@ -17,67 +17,49 @@
{ POSIX TYPE DEFINITIONS } { POSIX TYPE DEFINITIONS }
{***********************************************************************} {***********************************************************************}
Type type
{ the following type definitions are compiler dependant } { the following type definitions are compiler dependant }
{ and system dependant } { and system dependant }
cint8 = shortint; cint8 = shortint; pcint8 = ^cint8;
cuint8 = byte; cuint8 = byte; pcuint8 = ^cuint8;
cuint16 = word; cchar = cint8; pcchar = ^cchar;
cint16 = smallint; cschar = cint8; pcschar = ^cschar;
cint32 = longint; cuchar = cuint8; pcuchar = ^cuchar;
cuint32 = cardinal;
cint64 = int64;
cuint64 = qword;
cbool = longbool; cint16 = smallint; pcint16 = ^cint16;
cchar = shortint; cuint16 = word; pcuint16 = ^cuint16;
cuchar = byte; cshort = cint16; pcshort = ^cshort;
cint = longint; { minimum range is : 32-bit } csshort = cint16; pcsshort = ^csshort;
cuint = cardinal; { minimum range is : 32-bit } cushort = cuint16; pcushort = ^cushort;
csint = cint; cint32 = longint; pcint32 = ^cint32;
csigned = cint; cuint32 = longword; pcuint32 = ^cuint32;
cunsigned = cuint; cint = cint32; pcint = ^cint; { minimum range is : 32-bit }
csint = cint32; pcsint = ^csint; { minimum range is : 32-bit }
cuint = cuint32; pcuint = ^cuint; { minimum range is : 32-bit }
csigned = cint; pcsigned = ^csigned;
cunsigned = cuint; pcunsigned = ^cunsigned;
cint64 = int64; pcint64 = ^cint64;
cuint64 = qword; pcuint64 = ^cuint64;
clonglong = cint64; pclonglong = ^clonglong;
cslonglong = cint64; pcslonglong = ^cslonglong;
culonglong = cuint64; pculonglong = ^culonglong;
cbool = longbool; pcbool = ^cbool;
{$ifdef cpu64} {$ifdef cpu64}
clong = int64; clong = int64; pclong = ^clong;
culong = qword; cslong = int64; pcslong = ^cslong;
culong = qword; pculong = ^culong;
{$else} {$else}
clong = longint; clong = longint; pclong = ^clong;
culong = cardinal; cslong = longint; pcslong = ^cslong;
culong = cardinal; pculong = ^culong;
{$endif} {$endif}
clonglong = int64; cfloat = single; pcfloat = ^cfloat;
culonglong = qword; cdouble = double; pcdouble = ^cdouble;
cshort = smallint; clongdouble = extended; pclongdouble = ^clongdouble;
cushort = word;
pcint8 = ^cint8;
pcuint8 = ^cuint8;
pcint16 = ^cint16;
pcuint16 = ^cuint16;
pcint32 = ^cint32;
pcuint32 = ^cuint32;
pcint64 = ^cint64;
pcuint64 = ^cuint64;
pcbool = ^cbool;
pcchar = ^cchar;
pcuchar = ^cuchar;
pcint = ^cint;
pcuint = ^cuint;
pcsint = ^csint;
pcsigned = ^csigned;
pcunsigned = ^cunsigned;
pclong = ^clong;
pculong = ^culong;
pcshort = ^cshort;
pcushort = ^cushort;
{ Floating point }
cfloat = single;
cdouble = double;
cldouble = extended;
pcfloat = ^cfloat;
pcdouble = ^cdouble;
pcldouble = ^cldouble;