From 949dc98439162a4886154e57fefc0513e3ee4808 Mon Sep 17 00:00:00 2001 From: PHO <pho@cielonegro.org> Date: Fri, 15 Oct 2010 07:45:48 +0900 Subject: [PATCH] Use #integral_t whenever possible --- Bindings/CoreServices/CarbonCore/AIFF.hsc | 4 +- Bindings/CoreServices/CarbonCore/AVLTree.hsc | 6 +-- Bindings/CoreServices/CarbonCore/Aliases.hsc | 2 +- Bindings/CoreServices/CarbonCore/Files.hsc | 38 +++++++++---------- Bindings/CoreServices/CarbonCore/MacTypes.hsc | 22 +++++------ 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Bindings/CoreServices/CarbonCore/AIFF.hsc b/Bindings/CoreServices/CarbonCore/AIFF.hsc index 2d4d397..1ad7359 100644 --- a/Bindings/CoreServices/CarbonCore/AIFF.hsc +++ b/Bindings/CoreServices/CarbonCore/AIFF.hsc @@ -40,8 +40,8 @@ import Bindings.CoreServices.CarbonCore.MacTypes #num MACE3Type #num MACE6Type -#synonym_t ID , <UInt32> -#synonym_t MarkerIdType, <SInt16> +#integral_t ID +#integral_t MarkerIdType #starttype struct ChunkHeader # field ckID , <ID> diff --git a/Bindings/CoreServices/CarbonCore/AVLTree.hsc b/Bindings/CoreServices/CarbonCore/AVLTree.hsc index 7692547..e33dab2 100644 --- a/Bindings/CoreServices/CarbonCore/AVLTree.hsc +++ b/Bindings/CoreServices/CarbonCore/AVLTree.hsc @@ -5,16 +5,16 @@ module Bindings.CoreServices.CarbonCore.AVLTree where #strict_import import Bindings.CoreServices.CarbonCore.MacTypes -#synonym_t AVLVisitStage, <UInt16> +#integral_t AVLVisitStage #num kAVLPreOrder #num kAVLInOrder #num kAVLPostOrder -#synonym_t AVLOrder, <UInt16> +#integral_t AVLOrder #num kLeftToRight #num kRightToLeft -#synonym_t AVLNodeType, <UInt16> +#integral_t AVLNodeType #num kAVLIsTree #num kAVLIsLeftBranch #num kAVLIsRightBranch diff --git a/Bindings/CoreServices/CarbonCore/Aliases.hsc b/Bindings/CoreServices/CarbonCore/Aliases.hsc index f8a1345..c013c6f 100644 --- a/Bindings/CoreServices/CarbonCore/Aliases.hsc +++ b/Bindings/CoreServices/CarbonCore/Aliases.hsc @@ -7,7 +7,7 @@ import Bindings.CoreServices.CarbonCore.Files import Bindings.CoreServices.CarbonCore.MacTypes import Bindings.CoreServices.CarbonCore.UTCUtils -#synonym_t FSAliasInfoBitmap, <UInt32> +#integral_t FSAliasInfoBitmap #num kFSAliasInfoNone #num kFSAliasInfoVolumeCreateDate #num kFSAliasInfoTargetCreateDate diff --git a/Bindings/CoreServices/CarbonCore/Files.hsc b/Bindings/CoreServices/CarbonCore/Files.hsc index 0a8f481..c320115 100644 --- a/Bindings/CoreServices/CarbonCore/Files.hsc +++ b/Bindings/CoreServices/CarbonCore/Files.hsc @@ -182,7 +182,7 @@ import System.Posix.Types #num knoGroup -#synonym_t FSVolumeRefNum, <SInt16> +#integral_t FSVolumeRefNum #integral_t FSIORefNum #num kFSInvalidVolumeRefNum @@ -906,7 +906,7 @@ import System.Posix.Types # field fileSec , <FSFileSecurityRef> #stoptype -#synonym_t FSCatalogInfoBitmap, <UInt32> +#integral_t FSCatalogInfoBitmap #num kFSCatInfoNone #num kFSCatInfoTextEncoding #num kFSCatInfoNodeFlags @@ -1098,7 +1098,7 @@ import System.Posix.Types #stoptype #synonym_t FSCatalogBulkParamPtr, Ptr <FSCatalogBulkParam> -#synonym_t FSAllocationFlags, <UInt16> +#integral_t FSAllocationFlags #num kFSAllocDefaultFlags #num kFSAllocAllOrNothingMask #num kFSAllocContiguousMask @@ -1189,7 +1189,7 @@ import System.Posix.Types #stoptype #synonym_t FSRangeLockParamPtr, Ptr <FSRangeLockParam> -#synonym_t FSVolumeInfoBitmap, <UInt32> +#integral_t FSVolumeInfoBitmap #num kFSVolInfoNone #num kFSVolInfoCreateDate #num kFSVolInfoModDate @@ -1473,7 +1473,7 @@ import System.Posix.Types #ccall FSPathMakeRefWithOptions, Ptr <UInt8> -> <OptionBits> -> Ptr <FSRef> -> Ptr <Boolean> -> IO <OSStatus> #ccall FSIsFSRefValid , Ptr <FSRef> -> IO <Boolean> -#synonym_t FNMessage, <UInt32> +#integral_t FNMessage #num kFNDirectoryModifiedMessage #ccall FNNotify , Ptr <FSRef> -> <FNMessage> -> <OptionBits> -> IO <OSStatus> @@ -1501,17 +1501,17 @@ import System.Posix.Types #num kAsyncEjectInProgress #num kAsyncEjectComplete -#synonym_t FSMountStatus , <UInt32> -#synonym_t FSEjectStatus , <UInt32> -#synonym_t FSUnmountStatus , <UInt32> -#opaque_t OpaqueFSVolumeOperation -#synonym_t FSVolumeOperation , Ptr <OpaqueFSVolumeOperation> -#callback FSVolumeMountProcPtr , <FSVolumeOperation> -> Ptr () -> <OSStatus> -> <FSVolumeRefNum> -> IO () -#callback FSVolumeUnmountProcPtr, <FSVolumeOperation> -> Ptr () -> <OSStatus> -> <FSVolumeRefNum> -> CPid -> IO () -#callback FSVolumeEjectProcPtr , <FSVolumeOperation> -> Ptr () -> <OSStatus> -> <FSVolumeRefNum> -> CPid -> IO () -#synonym_t FSVolumeMountUPP , <FSVolumeMountProcPtr> -#synonym_t FSVolumeUnmountUPP , <FSVolumeUnmountProcPtr> -#synonym_t FSVolumeEjectUPP , <FSVolumeEjectProcPtr> +#integral_t FSMountStatus +#integral_t FSEjectStatus +#integral_t FSUnmountStatus +#opaque_t OpaqueFSVolumeOperation +#synonym_t FSVolumeOperation , Ptr <OpaqueFSVolumeOperation> +#callback FSVolumeMountProcPtr , <FSVolumeOperation> -> Ptr () -> <OSStatus> -> <FSVolumeRefNum> -> IO () +#callback FSVolumeUnmountProcPtr, <FSVolumeOperation> -> Ptr () -> <OSStatus> -> <FSVolumeRefNum> -> CPid -> IO () +#callback FSVolumeEjectProcPtr , <FSVolumeOperation> -> Ptr () -> <OSStatus> -> <FSVolumeRefNum> -> CPid -> IO () +#synonym_t FSVolumeMountUPP , <FSVolumeMountProcPtr> +#synonym_t FSVolumeUnmountUPP , <FSVolumeUnmountProcPtr> +#synonym_t FSVolumeEjectUPP , <FSVolumeEjectProcPtr> #num kFSMountServerMarkDoNotDisplay #num kFSMountServerMountOnMountDir @@ -1539,9 +1539,9 @@ import System.Posix.Types #ccall FSCopyDADiskForVolume , <FSVolumeRefNum> -> Ptr <DADiskRef> -> IO <OSStatus> #ccall FSGetVolumeForDADisk , <DADiskRef> -> Ptr <FSVolumeRefNum> -> IO <OSStatus> -#opaque_t __FSFileOperation -#synonym_t FSFileOperationRef , Ptr <__FSFileOperation> -#synonym_t FSFileOperationStage, <UInt32> +#opaque_t __FSFileOperation +#synonym_t FSFileOperationRef , Ptr <__FSFileOperation> +#integral_t FSFileOperationStage #starttype struct FSFileOperationClientContext # field version, <CFIndex> diff --git a/Bindings/CoreServices/CarbonCore/MacTypes.hsc b/Bindings/CoreServices/CarbonCore/MacTypes.hsc index 41b21b8..05cc03f 100644 --- a/Bindings/CoreServices/CarbonCore/MacTypes.hsc +++ b/Bindings/CoreServices/CarbonCore/MacTypes.hsc @@ -187,10 +187,10 @@ module Bindings.CoreServices.CarbonCore.MacTypes where #integral_t StyleParameter #synonym_t StyleField, <Style> -#synonym_t TimeValue , <SInt32> -#synonym_t TimeScale , <SInt32> -#synonym_t CompTimeValue, <wide> -#synonym_t TimeValue64 , <SInt64> +#integral_t TimeValue +#integral_t TimeScale +#synonym_t CompTimeValue, <wide> +#integral_t TimeValue64 #opaque_t TimeBaseRecord #synonym_t TimeBase, Ptr <TimeBaseRecord> @@ -229,13 +229,13 @@ module Bindings.CoreServices.CarbonCore.MacTypes where #synonym_t VersRecPtr , Ptr <VersRec> #synonym_t VersRecHndl, Ptr <VersRecPtr> -#synonym_t Byte , <UInt8> -#synonym_t SignedByte , <SInt8> -#synonym_t WidePtr , Ptr <wide> -#synonym_t UnsignedWidePtr, Ptr <UnsignedWide> -#synonym_t extended80 , <Float80> -#synonym_t extended96 , <Float96> -#synonym_t VHSelect , <SInt8> +#integral_t Byte +#integral_t SignedByte +#synonym_t WidePtr , Ptr <wide> +#synonym_t UnsignedWidePtr, Ptr <UnsignedWide> +#synonym_t extended80 , <Float80> +#synonym_t extended96 , <Float96> +#integral_t VHSelect #ccall Debugger , IO () #ccall DebugStr , <ConstStr255Param> -> IO () -- 2.40.0