From 3ced7be70cb60550cee3e43bfcf3d7c64dc99f4b Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Tue, 5 Feb 2008 16:07:18 +0000 Subject: [PATCH] * synchronised with r210 of the common pascal interfaces ... r210 | jonas | 2008-02-05 17:01:30 +0100 (Tue, 05 Feb 2008) | 2 lines Changed paths: M /metaPascal/trunc/MPPInterfaces/CFByteOrders.pas * fixed CFConvert*SwappedTo* for FPC ... git-svn-id: trunk@10231 - --- packages/univint/src/CFByteOrders.pas | 44 +++++++++++++-------------- packages/univint/src/FPCMacOSAll.pas | 44 +++++++++++++-------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/packages/univint/src/CFByteOrders.pas b/packages/univint/src/CFByteOrders.pas index 7fae8ba515..19d23d9dfd 100644 --- a/packages/univint/src/CFByteOrders.pas +++ b/packages/univint/src/CFByteOrders.pas @@ -3,7 +3,7 @@ } { Pascal Translation: Peter N Lewis, , August 2005 } { Pascal Translation Updated: Peter N Lewis, , September 2005 } -{ Pascal Translation Updated: Jonas Maebe, , April 2006 } +{ Pascal Translation Updated: Jonas Maebe, , April 2006, February 2008 } { Modified for use with Free Pascal Version 200 @@ -150,13 +150,13 @@ type end; function CFConvertFloat32HostToSwapped( arg: Float32 ): CFSwappedFloat32; inline; -function CFConvertFloat32SwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloat32SwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; function CFConvertFloat64HostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; -function CFConvertFloat64SwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertFloat64SwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; function CFConvertFloatHostToSwapped( arg: Float32 ): CFSwappedFloat32; inline; -function CFConvertFloatSwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloatSwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; function CFConvertDoubleHostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; -function CFConvertDoubleSwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertDoubleSwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; {$ifc TARGET_RT_LITTLE_ENDIAN} @@ -259,9 +259,9 @@ begin CFConvertFloat32HostToSwapped := CFSwappedFloat32(arg); end; -function CFConvertFloat32SwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloat32SwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; begin - CFConvertFloat32SwappedToHost := CFSwappedFloat32(arg); + CFConvertFloat32SwappedToHost := Float32(arg); end; function CFConvertFloat64HostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; @@ -269,9 +269,9 @@ begin CFConvertFloat64HostToSwapped := CFSwappedFloat64(arg); end; -function CFConvertFloat64SwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertFloat64SwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; begin - CFConvertFloat64SwappedToHost := CFSwappedFloat64(arg); + CFConvertFloat64SwappedToHost := Float64(arg); end; function CFConvertFloatHostToSwapped( arg: Float32 ): CFSwappedFloat32; inline; @@ -279,19 +279,19 @@ begin CFConvertFloatHostToSwapped := CFSwappedFloat32(arg); end; -function CFConvertFloatSwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloatSwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; begin - CFConvertFloatSwappedToHost := CFSwappedFloat32(arg); + CFConvertFloatSwappedToHost := Float32(arg); end; -function CFConvertDoubleHostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertDoubleHostToSwapped( arg: Float64): CFSwappedFloat64; inline; begin CFConvertDoubleHostToSwapped := CFSwappedFloat64(arg); end; -function CFConvertDoubleSwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertDoubleSwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; begin - CFConvertDoubleSwappedToHost := CFSwappedFloat64(arg); + CFConvertDoubleSwappedToHost := Float64(arg); end; {$elsec} @@ -361,9 +361,9 @@ begin CFConvertFloat32HostToSwapped.v := CFSwapInt32(CFSwappedFloat32(arg).v); end; -function CFConvertFloat32SwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloat32SwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; begin - CFConvertFloat32SwappedToHost.v := CFSwapInt32(CFSwappedFloat32(arg).v); + CFConvertFloat32SwappedToHost := Float32(CFSwappedFloat32(CFSwapInt32(arg.v))); end; function CFConvertFloat64HostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; @@ -371,9 +371,9 @@ begin CFConvertFloat64HostToSwapped.v := CFSwapInt64(CFSwappedFloat64(arg).v); end; -function CFConvertFloat64SwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertFloat64SwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; begin - CFConvertFloat64SwappedToHost.v := CFSwapInt64(CFSwappedFloat64(arg).v); + CFConvertFloat64SwappedToHost := Float64(CFSwappedFloat64(CFSwapInt64(arg.v))); end; function CFConvertFloatHostToSwapped( arg: Float32 ): CFSwappedFloat32; inline; @@ -381,9 +381,9 @@ begin CFConvertFloatHostToSwapped.v := CFSwapInt32(CFSwappedFloat32(arg).v); end; -function CFConvertFloatSwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloatSwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; begin - CFConvertFloatSwappedToHost.v := CFSwapInt32(CFSwappedFloat32(arg).v); + CFConvertFloatSwappedToHost := Float32(CFSwappedFloat32(CFSwapInt32(arg.v))); end; function CFConvertDoubleHostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; @@ -391,9 +391,9 @@ begin CFConvertDoubleHostToSwapped.v := CFSwapInt64(CFSwappedFloat64(arg).v); end; -function CFConvertDoubleSwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertDoubleSwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; begin - CFConvertDoubleSwappedToHost.v := CFSwapInt64(CFSwappedFloat64(arg).v); + CFConvertDoubleSwappedToHost := Float64(CFSwappedFloat64(CFSwapInt64(arg.v))); end; {$endc} diff --git a/packages/univint/src/FPCMacOSAll.pas b/packages/univint/src/FPCMacOSAll.pas index cb73648e17..04a7d7bb2f 100644 --- a/packages/univint/src/FPCMacOSAll.pas +++ b/packages/univint/src/FPCMacOSAll.pas @@ -16004,7 +16004,7 @@ procedure CFBitVectorSetAllBits( bv: CFMutableBitVectorRef; value: CFBit ); exte } { Pascal Translation: Peter N Lewis, , August 2005 } { Pascal Translation Updated: Peter N Lewis, , September 2005 } -{ Pascal Translation Updated: Jonas Maebe, , April 2006 } +{ Pascal Translation Updated: Jonas Maebe, , April 2006, February 2008 } { Modified for use with Free Pascal Version 200 @@ -16069,13 +16069,13 @@ type end; function CFConvertFloat32HostToSwapped( arg: Float32 ): CFSwappedFloat32; inline; -function CFConvertFloat32SwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloat32SwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; function CFConvertFloat64HostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; -function CFConvertFloat64SwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertFloat64SwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; function CFConvertFloatHostToSwapped( arg: Float32 ): CFSwappedFloat32; inline; -function CFConvertFloatSwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloatSwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; function CFConvertDoubleHostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; -function CFConvertDoubleSwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertDoubleSwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; {$ifc TARGET_RT_LITTLE_ENDIAN} @@ -270570,9 +270570,9 @@ begin CFConvertFloat32HostToSwapped := CFSwappedFloat32(arg); end; -function CFConvertFloat32SwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloat32SwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; begin - CFConvertFloat32SwappedToHost := CFSwappedFloat32(arg); + CFConvertFloat32SwappedToHost := Float32(arg); end; function CFConvertFloat64HostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; @@ -270580,9 +270580,9 @@ begin CFConvertFloat64HostToSwapped := CFSwappedFloat64(arg); end; -function CFConvertFloat64SwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertFloat64SwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; begin - CFConvertFloat64SwappedToHost := CFSwappedFloat64(arg); + CFConvertFloat64SwappedToHost := Float64(arg); end; function CFConvertFloatHostToSwapped( arg: Float32 ): CFSwappedFloat32; inline; @@ -270590,19 +270590,19 @@ begin CFConvertFloatHostToSwapped := CFSwappedFloat32(arg); end; -function CFConvertFloatSwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloatSwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; begin - CFConvertFloatSwappedToHost := CFSwappedFloat32(arg); + CFConvertFloatSwappedToHost := Float32(arg); end; -function CFConvertDoubleHostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertDoubleHostToSwapped( arg: Float64): CFSwappedFloat64; inline; begin CFConvertDoubleHostToSwapped := CFSwappedFloat64(arg); end; -function CFConvertDoubleSwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertDoubleSwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; begin - CFConvertDoubleSwappedToHost := CFSwappedFloat64(arg); + CFConvertDoubleSwappedToHost := Float64(arg); end; {$elsec} @@ -270672,9 +270672,9 @@ begin CFConvertFloat32HostToSwapped.v := CFSwapInt32(CFSwappedFloat32(arg).v); end; -function CFConvertFloat32SwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloat32SwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; begin - CFConvertFloat32SwappedToHost.v := CFSwapInt32(CFSwappedFloat32(arg).v); + CFConvertFloat32SwappedToHost := Float32(CFSwappedFloat32(CFSwapInt32(arg.v))); end; function CFConvertFloat64HostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; @@ -270682,9 +270682,9 @@ begin CFConvertFloat64HostToSwapped.v := CFSwapInt64(CFSwappedFloat64(arg).v); end; -function CFConvertFloat64SwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertFloat64SwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; begin - CFConvertFloat64SwappedToHost.v := CFSwapInt64(CFSwappedFloat64(arg).v); + CFConvertFloat64SwappedToHost := Float64(CFSwappedFloat64(CFSwapInt64(arg.v))); end; function CFConvertFloatHostToSwapped( arg: Float32 ): CFSwappedFloat32; inline; @@ -270692,9 +270692,9 @@ begin CFConvertFloatHostToSwapped.v := CFSwapInt32(CFSwappedFloat32(arg).v); end; -function CFConvertFloatSwappedToHost( arg: Float32 ): CFSwappedFloat32; inline; +function CFConvertFloatSwappedToHost( arg: CFSwappedFloat32 ): Float32; inline; begin - CFConvertFloatSwappedToHost.v := CFSwapInt32(CFSwappedFloat32(arg).v); + CFConvertFloatSwappedToHost := Float32(CFSwappedFloat32(CFSwapInt32(arg.v))); end; function CFConvertDoubleHostToSwapped( arg: Float64 ): CFSwappedFloat64; inline; @@ -270702,9 +270702,9 @@ begin CFConvertDoubleHostToSwapped.v := CFSwapInt64(CFSwappedFloat64(arg).v); end; -function CFConvertDoubleSwappedToHost( arg: Float64 ): CFSwappedFloat64; inline; +function CFConvertDoubleSwappedToHost( arg: CFSwappedFloat64 ): Float64; inline; begin - CFConvertDoubleSwappedToHost.v := CFSwapInt64(CFSwappedFloat64(arg).v); + CFConvertDoubleSwappedToHost := Float64(CFSwappedFloat64(CFSwapInt64(arg.v))); end; {$endc}