mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-12 07:06:08 +02:00
-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
parent
d4e1612fd1
commit
23e1ebb357
@ -23,78 +23,53 @@ interface
|
||||
uses unixtype;
|
||||
{$i aliasctp.inc}
|
||||
{$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
|
||||
{ the following type definitions are compiler dependant }
|
||||
{ and system dependant }
|
||||
cint16 = smallint; pcint16 = ^cint16;
|
||||
cuint16 = word; pcuint16 = ^cuint16;
|
||||
cshort = cint16; pcshort = ^cshort;
|
||||
csshort = cint16; pcsshort = ^csshort;
|
||||
cushort = cuint16; pcushort = ^cushort;
|
||||
|
||||
cint8 = shortint;
|
||||
cuint8 = byte;
|
||||
cuint16 = word;
|
||||
cint16 = smallint;
|
||||
cint32 = longint;
|
||||
cuint32 = cardinal;
|
||||
cint64 = int64;
|
||||
cuint64 = qword;
|
||||
cint32 = longint; pcint32 = ^cint32;
|
||||
cuint32 = longword; pcuint32 = ^cuint32;
|
||||
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;
|
||||
|
||||
cbool = longbool;
|
||||
cchar = shortint;
|
||||
cuchar = byte;
|
||||
cint = longint; { minimum range is : 32-bit }
|
||||
cuint = cardinal; { minimum range is : 32-bit }
|
||||
|
||||
csint = cint;
|
||||
csigned = cint;
|
||||
cunsigned = cuint;
|
||||
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}
|
||||
clong = int64;
|
||||
culong = qword;
|
||||
clong = int64; pclong = ^clong;
|
||||
cslong = int64; pcslong = ^cslong;
|
||||
culong = qword; pculong = ^culong;
|
||||
{$else}
|
||||
clong = longint;
|
||||
culong = cardinal;
|
||||
clong = longint; pclong = ^clong;
|
||||
cslong = longint; pcslong = ^cslong;
|
||||
culong = cardinal; pculong = ^culong;
|
||||
{$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;
|
||||
cdouble = double;
|
||||
cldouble = extended;
|
||||
pcfloat = ^cfloat;
|
||||
pcdouble = ^cdouble;
|
||||
pcldouble = ^cldouble;
|
||||
cfloat = single; pcfloat = ^cfloat;
|
||||
cdouble = double; pcdouble = ^cdouble;
|
||||
clongdouble = extended; pclongdouble = ^clongdouble;
|
||||
{$endif}
|
||||
|
||||
// Kylix compat types
|
||||
u_long = culong;
|
||||
u_short = cushort;
|
||||
|
||||
implementation
|
||||
|
||||
|
||||
end.
|
||||
|
||||
@ -15,54 +15,40 @@
|
||||
|
||||
**********************************************************************}
|
||||
|
||||
Type
|
||||
cInt8 = UnixType.cInt8;
|
||||
cUInt8 = UnixType.cUInt8;
|
||||
cUInt16 = UnixType.cUInt16;
|
||||
cInt16 = UnixType.cInt16;
|
||||
cInt32 = UnixType.cInt32;
|
||||
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;
|
||||
type
|
||||
cint8 = UnixType.cint8; pcint8 = UnixType.pcint8;
|
||||
cuint8 = UnixType.cuint8; pcuint8 = UnixType.pcuint8;
|
||||
cchar = UnixType.cchar; pcchar = UnixType.pcchar;
|
||||
cschar = UnixType.cschar; pcschar = UnixType.pcschar;
|
||||
cuchar = UnixType.cuchar; pcuchar = UnixType.pcuchar;
|
||||
|
||||
pcint8 = UnixType.pcint8;
|
||||
pcuint8 = UnixType.pcuint8;
|
||||
pcint16 = UnixType.pcint16;
|
||||
pcuint16= UnixType.pcuint16;
|
||||
pcint32 = UnixType.pcint32;
|
||||
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;
|
||||
cint16 = UnixType.cint16; pcint16 = UnixType.pcint16;
|
||||
cuint16 = UnixType.cuint16; pcuint16 = UnixType.pcuint16;
|
||||
cshort = UnixType.cshort; pcshort = UnixType.pcshort;
|
||||
csshort = UnixType.csshort; pcsshort = UnixType.pcsshort;
|
||||
cushort = UnixType.cushort; pcushort = UnixType.pcushort;
|
||||
|
||||
{ Floating point }
|
||||
cFloat = UnixType.cFloat;
|
||||
cDouble = UnixType.cDouble;
|
||||
clDouble = UnixType.clDouble;
|
||||
pcFloat = UnixType.pcFloat;
|
||||
pcDouble = UnixType.pcDouble;
|
||||
pclDouble = UnixType.pclDouble;
|
||||
cint32 = UnixType.cint32; pcint32 = UnixType.pcint32;
|
||||
cuint32 = UnixType.cuint32; pcuint32 = UnixType.pcuint32;
|
||||
cint = UnixType.cint; pcint = UnixType.pcint;
|
||||
csint = UnixType.csint; pcsint = UnixType.pcsint;
|
||||
cuint = UnixType.cuint; pcuint = UnixType.pcuint;
|
||||
csigned = UnixType.csigned; pcsigned = UnixType.pcsigned;
|
||||
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;
|
||||
|
||||
|
||||
@ -17,67 +17,49 @@
|
||||
{ POSIX TYPE DEFINITIONS }
|
||||
{***********************************************************************}
|
||||
|
||||
Type
|
||||
{ the following type definitions are compiler dependant }
|
||||
{ and system dependant }
|
||||
type
|
||||
{ the following type definitions are compiler dependant }
|
||||
{ and system dependant }
|
||||
|
||||
cint8 = shortint;
|
||||
cuint8 = byte;
|
||||
cuint16 = word;
|
||||
cint16 = smallint;
|
||||
cint32 = longint;
|
||||
cuint32 = cardinal;
|
||||
cint64 = int64;
|
||||
cuint64 = qword;
|
||||
cint8 = shortint; pcint8 = ^cint8;
|
||||
cuint8 = byte; pcuint8 = ^cuint8;
|
||||
cchar = cint8; pcchar = ^cchar;
|
||||
cschar = cint8; pcschar = ^cschar;
|
||||
cuchar = cuint8; pcuchar = ^cuchar;
|
||||
|
||||
cbool = longbool;
|
||||
cchar = shortint;
|
||||
cuchar = byte;
|
||||
cint = longint; { minimum range is : 32-bit }
|
||||
cuint = cardinal; { minimum range is : 32-bit }
|
||||
cint16 = smallint; pcint16 = ^cint16;
|
||||
cuint16 = word; pcuint16 = ^cuint16;
|
||||
cshort = cint16; pcshort = ^cshort;
|
||||
csshort = cint16; pcsshort = ^csshort;
|
||||
cushort = cuint16; pcushort = ^cushort;
|
||||
|
||||
csint = cint;
|
||||
csigned = cint;
|
||||
cunsigned = cuint;
|
||||
cint32 = longint; pcint32 = ^cint32;
|
||||
cuint32 = longword; pcuint32 = ^cuint32;
|
||||
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}
|
||||
clong = int64;
|
||||
culong = qword;
|
||||
clong = int64; pclong = ^clong;
|
||||
cslong = int64; pcslong = ^cslong;
|
||||
culong = qword; pculong = ^culong;
|
||||
{$else}
|
||||
clong = longint;
|
||||
culong = cardinal;
|
||||
clong = longint; pclong = ^clong;
|
||||
cslong = longint; pcslong = ^cslong;
|
||||
culong = cardinal; pculong = ^culong;
|
||||
{$endif}
|
||||
|
||||
clonglong = int64;
|
||||
culonglong = qword;
|
||||
cshort = smallint;
|
||||
cushort = word;
|
||||
cfloat = single; pcfloat = ^cfloat;
|
||||
cdouble = double; pcdouble = ^cdouble;
|
||||
clongdouble = extended; pclongdouble = ^clongdouble;
|
||||
|
||||
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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user