* synchronised with r204 of the universal interfaces (r201-202 were

    tests of the move of the svn server):
...
r204 | jonas | 2007-05-02 16:20:32 +0200 (Wed, 02 May 2007) | 2 lines

  * fixed CFSwapInt64 for FPC

...
r203 | gale | 2007-04-18 15:08:43 +0200 (Wed, 18 Apr 2007) | 5 lines

As a temporary trial fix, fixed record field identifier related
redeclaration warnings by declaring and using additional type declarations
with a "_GAP_Private_field_type_fix" suffix added to conflicting record
field type identifiers.

git-svn-id: trunk@7243 -

packages/extra/univint/ATSTypes.pas

@@ -386,6 +386,7 @@ type
 	end;
 
 	GlyphID								= ATSGlyphRef;
+	GlyphID_GAP_Private_field_type_fix	= GlyphID; { used as field type when a record declaration contains a GlyphID field identifier }
 	GlyphIDPtr = ^GlyphID;
 {$ALIGN MAC68K}
 

packages/extra/univint/ATSUnicodeTypes.pas

@@ -1021,7 +1021,7 @@ type
    * kGlyphCollectionGID). For Adobe glyph collections, this value
    * represents a CID
    }
-		glyphID: GlyphID;
+		glyphID: GlyphID_GAP_Private_field_type_fix;
 	end;
 	ATSUGlyphSelectorPtr = ^ATSUGlyphSelector;
 
@@ -1100,7 +1100,7 @@ type
  }
 type
 	ATSUGlyphInfo = record
-		glyphID: GlyphID;
+		glyphID: GlyphID_GAP_Private_field_type_fix;
 		reserved: UInt16;
 		layoutFlags: UInt32;
 		charIndex: UniCharArrayOffset;

packages/extra/univint/CFByteOrders.pas

@@ -190,7 +190,7 @@ end;
 
 function CFSwapInt64( arg: UInt64 ): UInt64; inline;
 begin
-	CFSwapInt64 := (CFSwapInt32( arg and $FFFFFFFF ) shl 32) or CFSwapInt32( (arg shr 32) and $FFFFFFFF );
+	CFSwapInt64 := (UInt64(CFSwapInt32( arg and $FFFFFFFF )) shl 32) or CFSwapInt32( (arg shr 32) and $FFFFFFFF );
 end;
 
 {$ifc TARGET_RT_BIG_ENDIAN}

packages/extra/univint/CarbonEvents.pas

@@ -9303,8 +9303,8 @@ type
 	HICommand = record
 		attributes: UInt32;
 		commandID: UInt32;
-		menuRef: MenuRef;
-		menuItemIndex: MenuItemIndex;
+		menuRef: MenuRef_GAP_Private_field_type_fix;
+		menuItemIndex: MenuItemIndex_GAP_Private_field_type_fix;
 	end;
 	HICommandPtr = ^HICommand;
 type
@@ -9319,8 +9319,8 @@ type
 			window: WindowRef;
 		);
 		2: (
-			menuRef: MenuRef;
-			menuItemIndex: MenuItemIndex;
+			menuRef: MenuRef_GAP_Private_field_type_fix;
+			menuItemIndex: MenuItemIndex_GAP_Private_field_type_fix;
 		 );
 	end;
 	HICommandExtendedPtr = ^HICommandExtended;

packages/extra/univint/Controls.pas

@@ -379,13 +379,13 @@ type
 			resID:				SInt16;
 			);
 		1: (
-			cIconHandle:		CIconHandle;
+			cIconHandle:		CIconHandle_GAP_Private_field_type_fix;
 			);
 		2: (
 			iconSuite:			Handle;
 			);
 		3: (
-			iconRef:			IconRef;
+			iconRef:			IconRef_GAP_Private_field_type_fix;
 			);
 		4: (
 			picture:			PicHandle;
@@ -729,7 +729,7 @@ type
 	ControlDataAccessRec = record
 		tag: ResType;
 		part: ResType;
-		size: Size;
+		size: Size_GAP_Private_field_type_fix;
 		dataPtr: Ptr;
 	end;
 type

packages/extra/univint/DriverFamilyMatching.pas

@@ -212,6 +212,7 @@ const
 
 type
 	DriverDescVersion					= UInt32;
+	DriverDescVersion_GAP_Private_field_type_fix = DriverDescVersion; { used as field type when a record declaration contains a DriverDescVersion field identifier }
 	{	  The Driver Description 	}
 
 const
@@ -226,7 +227,7 @@ type
 	DriverDescriptionPtr = ^DriverDescription;
 	DriverDescription = record
 		driverDescSignature:	OSType;									{  Signature field of this structure }
-		driverDescVersion:		DriverDescVersion;						{  Version of this data structure }
+		driverDescVersion:		DriverDescVersion_GAP_Private_field_type_fix; {  Version of this data structure }
 		driverType:				MacDriverType;							{  Type of Driver }
 		driverOSRuntimeInfo:	DriverOSRuntime;						{  OS Runtime Requirements of Driver }
 		driverServices:			DriverOSService;						{  Apple Service API Membership }

packages/extra/univint/FPCMacOSAll.pas

@@ -484,7 +484,9 @@ type
 	Ptr = ^SInt8;
 	PtrPtr = ^Ptr;       
 	Handle = ^Ptr;
+	Handle_GAP_Private_field_type_fix = Handle; { used as field type when a record declaration contains a Handle field identifier }
 	Size = SInt32;
+	Size_GAP_Private_field_type_fix = Size; { used as field type when a record declaration contains a Size field identifier }
 	SizePtr = ^Size;
 	UnivPtr = Pointer;
 	UnivPtrPtr = ^UnivPtr;
@@ -542,6 +544,7 @@ type
  	RegionCodePtr = ^RegionCode;
 	FourCharCode = UInt32;
 	OSType = FourCharCode;
+	OSType_GAP_Private_field_type_fix = OSType; { used as field type when a record declaration contains a OSType field identifier }
 	ResType = FourCharCode;
 	OSTypePtr = ^OSType;
 	ResTypePtr = ^ResType;
@@ -558,6 +561,7 @@ type
 type
 { "Boolean", "true", and "false" are built into the Pascal language }
 	BooleanPtr = ^Boolean;
+	boolean_GAP_Private_field_type_fix = boolean; { used as field type when a record declaration contains a boolean field identifier }
 {*******************************************************************************
 
     Function Pointer Types
@@ -803,6 +807,7 @@ const
 
 type
 	Style = SInt8;
+	Style_GAP_Private_field_type_fix = Style; { used as field type when a record declaration contains a Style field identifier }
 	StyleParameter = SInt16;
 	StyleField = Style;
 
@@ -822,11 +827,13 @@ type
 type
 	TimeValue = SInt32;
 	TimeScale = SInt32;
+	TimeScale_GAP_Private_field_type_fix = TimeScale; { used as field type when a record declaration contains a TimeScale field identifier }
 	CompTimeValue = wide;
 	CompTimeValuePtr = ^CompTimeValue;
 	TimeValue64 = SInt64;
 	TimeValue64Ptr = ^TimeValue64;
 	TimeBase = ^SInt32; { an opaque 32-bit type }
+	TimeBase_GAP_Private_field_type_fix = TimeBase; { used as field type when a record declaration contains a TimeBase field identifier }
 	TimeBasePtr = ^TimeBase;
 	TimeRecord = record
 		value: CompTimeValue;                  { units (duration or absolute) }
@@ -48755,6 +48762,7 @@ const
 
 type
 	TextEncoding						= UInt32;
+	TextEncoding_GAP_Private_field_type_fix = TextEncoding; { used as field type when a record declaration contains a TextEncoding field identifier }
 	TextEncodingPtr						= ^TextEncoding; { when a VAR xx: TextEncoding parameter can be nil, it is changed to xx: TextEncodingPtr }
 	{  name part selector for GetTextEncodingName }
 	TextEncodingNameSelector			= UInt32;
@@ -48771,7 +48779,7 @@ type
 	TextEncodingRunPtr = ^TextEncodingRun;
 	TextEncodingRun = record
 		offset:					ByteOffset;
-		textEncoding:			TextEncoding;
+		textEncoding:			TextEncoding_GAP_Private_field_type_fix;
 	end;
 
 	ConstTextEncodingRunPtr				= ^TextEncodingRun;
@@ -72316,6 +72324,7 @@ type
 	end;
 
 	GlyphID								= ATSGlyphRef;
+	GlyphID_GAP_Private_field_type_fix	= GlyphID; { used as field type when a record declaration contains a GlyphID field identifier }
 	GlyphIDPtr = ^GlyphID;
 {$ALIGN MAC68K}
 
@@ -88259,6 +88268,7 @@ const
 
 type
 	DriverDescVersion					= UInt32;
+	DriverDescVersion_GAP_Private_field_type_fix = DriverDescVersion; { used as field type when a record declaration contains a DriverDescVersion field identifier }
 	{	  The Driver Description 	}
 
 const
@@ -88273,7 +88283,7 @@ type
 	DriverDescriptionPtr = ^DriverDescription;
 	DriverDescription = record
 		driverDescSignature:	OSType;									{  Signature field of this structure }
-		driverDescVersion:		DriverDescVersion;						{  Version of this data structure }
+		driverDescVersion:		DriverDescVersion_GAP_Private_field_type_fix; {  Version of this data structure }
 		driverType:				MacDriverType;							{  Type of Driver }
 		driverOSRuntimeInfo:	DriverOSRuntime;						{  OS Runtime Requirements of Driver }
 		driverServices:			DriverOSService;						{  Apple Service API Membership }
@@ -101160,6 +101170,7 @@ type
 	GDevicePtr = ^GDevice;
 	GDPtr								= ^GDevice;
 	GDHandle							= ^GDPtr;
+	GDHandle_GAP_Private_field_type_fix	= GDHandle; { used as field type when a record declaration contains a GDHandle field identifier }
 	GDHandlePtr							= ^GDHandle; { when a VAR xx: GDHandle parameter can be nil, it is changed to xx: GDHandlePtr }
 	GDevice = record
 		gdRefNum:				SInt16;								{ driver's unit number }
@@ -114178,6 +114189,7 @@ type
 	end;
 
 	CIconHandle							= ^CIconPtr;
+	CIconHandle_GAP_Private_field_type_fix = CIconHandle; { used as field type when a record declaration contains a CIconHandle field identifier }
 	{
 	 *  GetCIcon()
 	 *  
@@ -114234,6 +114246,7 @@ type
 	IconCacheRef						= Handle;
 	{  IconRefs are 32-bit values identifying cached icon data. IconRef 0 is invalid. }
 	IconRef    = ^SInt32; { an opaque 32-bit type }
+	IconRef_GAP_Private_field_type_fix = IconRef; { used as field type when a record declaration contains a IconRef field identifier }
 	IconRefPtr = ^IconRef;  { when a var xx:IconRef parameter can be nil, it is changed to xx: IconRefPtr }
 	{
 	 *  PlotIconID()
@@ -118888,7 +118901,9 @@ const
 
 type
 	USBReference						= SInt32;
+	USBReference_GAP_Private_field_type_fix	= USBReference; { used as field type when a record declaration contains a USBReference field identifier }
 	USBDeviceRef						= USBReference;
+	USBDeviceRef_GAP_Private_field_type_fix	= USBDeviceRef; { used as field type when a record declaration contains a USBDeviceRef field identifier }
 	USBDeviceRefPtr						= ^USBDeviceRef;
 	USBInterfaceRef						= USBReference;
 	USBPipeRef							= USBReference;
@@ -118896,6 +118911,7 @@ type
 	USBPipeState						= UInt32;
 	USBCount							= UInt32;
 	USBFlags							= UInt32;
+	USBFlags_GAP_Private_field_type_fix	= USBFlags; { used as field type when a record declaration contains a USBFlags field identifier }
 	USBRequest							= UInt8;
 	USBDirection						= UInt8;
 	USBRqRecipient						= UInt8;
@@ -118941,8 +118957,10 @@ type
 	USBPBPtr = ^USBPB;
 {$ifc TYPED_FUNCTION_POINTERS}
 	USBCompletion = procedure(pb: USBPBPtr);
+	USBCompletion_GAP_Private_field_type_fix = USBCompletion; { used as field type when a record declaration contains a USBCompletion field identifier }
 {$elsec}
 	USBCompletion = ProcPtr;
+	USBCompletion_GAP_Private_field_type_fix = USBCompletion; { used as field type when a record declaration contains a USBCompletion field identifier }
 {$endc}
 
 	USBVariantBitsPtr = ^USBVariantBits;
@@ -118967,13 +118985,13 @@ type
 		reserved1:				UInt16;
 		reserved2:				UInt32;
 		usbStatus:				OSStatus;
-		usbCompletion:			USBCompletion;
+		usbCompletion:			USBCompletion_GAP_Private_field_type_fix;
 		usbRefcon:				UInt32;
-		usbReference:			USBReference;
+		usbReference:			USBReference_GAP_Private_field_type_fix;
 		usbBuffer:				Ptr;
 		usbReqCount:			USBCount;
 		usbActCount:			USBCount;
-		usbFlags:				USBFlags;
+		usbFlags:				USBFlags_GAP_Private_field_type_fix;
 		usb:					USBVariantBits;
 		usbFrame:				UInt32;
 		usbClassType:			UInt8;
@@ -119900,7 +119918,7 @@ type
 		pbVersion:				UInt16;
 		usbDeviceNotification:	SInt8;
 		reserved1:				SInt8;									{  needed because of 2-byte 68k alignment }
-		usbDeviceRef:			USBDeviceRef;
+		usbDeviceRef:			USBDeviceRef_GAP_Private_field_type_fix;
 		usbClass:				UInt16;
 		usbSubClass:			UInt16;
 		usbProtocol:			UInt16;
@@ -120382,8 +120400,10 @@ const
 
 type
 	USBDriverDescVersion				= UInt32;
+	USBDriverDescVersion_GAP_Private_field_type_fix	= USBDriverDescVersion; { used as field type when a record declaration contains a USBDriverDescVersion field identifier }
 	{   Driver Loading Options }
 	USBDriverLoadingOptions 	= UInt32;
+	USBDriverLoadingOptions_GAP_Private_field_type_fix = USBDriverLoadingOptions; { used as field type when a record declaration contains a USBDriverLoadingOptions field identifier }
 const
 	kUSBDoNotMatchGenericDevice	= $00000001;					{  Driver's VendorID must match Device's VendorID }
 	kUSBDoNotMatchInterface		= $00000002;					{  Do not load this driver as an interface driver. }
@@ -120401,6 +120421,7 @@ type
 		usbDeviceReleaseNumber:	UInt16;									{  Release Number of Device }
 		usbDeviceProtocol:		UInt16;									{  Protocol Info. }
 	end;
+	USBDeviceInfo_GAP_Private_field_type_fix = USBDeviceInfo; { used as field type when a record declaration contains a USBDeviceInfo field identifier }
 
 	USBInterfaceInfoPtr = ^USBInterfaceInfo;
 	USBInterfaceInfo = record
@@ -120411,6 +120432,7 @@ type
 		usbInterfaceProtocol:	SInt8;									{  Interface Protocol }
 		pad:					SInt8
 	end;
+	USBInterfaceInfo_GAP_Private_field_type_fix = USBInterfaceInfo; { used as field type when a record declaration contains a USBInterfaceInfo field identifier }
 
 	USBDriverTypePtr = ^USBDriverType;
 	USBDriverType = record
@@ -120419,15 +120441,16 @@ type
 		usbDriverSubClass:		SInt8;									{  Module type }
 		usbDriverVersion:		NumVersion;								{  Class driver version number. }
 	end;
+	USBDriverType_GAP_Private_field_type_fix = USBDriverType; { used as field type when a record declaration contains a USBDriverType field identifier }
 
 	USBDriverDescriptionPtr = ^USBDriverDescription;
 	USBDriverDescription = record
 		usbDriverDescSignature:	OSType;									{  Signature field of this structure. }
-		usbDriverDescVersion:	USBDriverDescVersion;					{  Version of this data structure. }
-		usbDeviceInfo:			USBDeviceInfo;							{  Product & Vendor Info }
-		usbInterfaceInfo:		USBInterfaceInfo;						{  Interface info }
-		usbDriverType:			USBDriverType;							{  Driver Info. }
-		usbDriverLoadingOptions: USBDriverLoadingOptions;				{  Options for class driver loading. }
+		usbDriverDescVersion:	USBDriverDescVersion_GAP_Private_field_type_fix; {  Version of this data structure. }
+		usbDeviceInfo:			USBDeviceInfo_GAP_Private_field_type_fix; {  Product & Vendor Info }
+		usbInterfaceInfo:		USBInterfaceInfo_GAP_Private_field_type_fix; {  Interface info }
+		usbDriverType:			USBDriverType_GAP_Private_field_type_fix; {  Driver Info. }
+		usbDriverLoadingOptions: USBDriverLoadingOptions_GAP_Private_field_type_fix; {  Options for class driver loading. }
 	end;
 
 	{
@@ -120506,6 +120529,7 @@ const
 
 type
 	USBShimDescVersion 			= UInt32;
+	USBShimDescVersion_GAP_Private_field_type_fix = USBShimDescVersion; { used as field type when a record declaration contains a USBShimDescVersion field identifier }
 const
 	kCurrentUSBShimDescVers		= $0100;
 
@@ -120521,7 +120545,7 @@ type
 	USBShimDescriptionPtr = ^USBShimDescription;
 	USBShimDescription = record
 		usbShimDescSignature:	OSType;									{  Signature field of this structure. }
-		usbShimDescVersion:		USBShimDescVersion;						{  Version of this data structure. }
+		usbShimDescVersion:		USBShimDescVersion_GAP_Private_field_type_fix; {  Version of this data structure. }
 		usbDriverLoadingOptions: USBShimLoadingOptions;					{  Options for shim loading. }
 		libraryName:			Str63;									{  For optional shared library registration }
 	end;
@@ -121854,7 +121878,7 @@ type
    * kGlyphCollectionGID). For Adobe glyph collections, this value
    * represents a CID
    }
-		glyphID: GlyphID;
+		glyphID: GlyphID_GAP_Private_field_type_fix;
 	end;
 	ATSUGlyphSelectorPtr = ^ATSUGlyphSelector;
 
@@ -121933,7 +121957,7 @@ type
  }
 type
 	ATSUGlyphInfo = record
-		glyphID: GlyphID;
+		glyphID: GlyphID_GAP_Private_field_type_fix;
 		reserved: UInt16;
 		layoutFlags: UInt32;
 		charIndex: UniCharArrayOffset;
@@ -127109,10 +127133,12 @@ type
 	MenuID = SInt16;
 type
 	MenuItemIndex = UInt16;
+	MenuItemIndex_GAP_Private_field_type_fix = MenuItemIndex; { used as field type when a record declaration contains a MenuItemIndex field identifier }
 	MenuItemIndexPtr = ^MenuItemIndex;
 	MenuCommand = UInt32;
 type
 	MenuRef = ^SInt32; { an opaque 32-bit type }
+	MenuRef_GAP_Private_field_type_fix = MenuRef; { used as field type when a record declaration contains a MenuRef field identifier }
 	MenuRefPtr = ^MenuRef;
 { MenuHandle is old name for MenuRef}
 type
@@ -127571,7 +127597,7 @@ type
 		cmdKey: UniChar;
 		cmdKeyGlyph: UInt32;
 		cmdKeyModifiers: UInt32;
-		style: Style;
+		style: Style_GAP_Private_field_type_fix;
 		enabled: Boolean;
 		iconEnabled: Boolean;
 		filler1: SInt8;
@@ -148684,13 +148710,13 @@ type
 			resID:				SInt16;
 			);
 		1: (
-			cIconHandle:		CIconHandle;
+			cIconHandle:		CIconHandle_GAP_Private_field_type_fix;
 			);
 		2: (
 			iconSuite:			Handle;
 			);
 		3: (
-			iconRef:			IconRef;
+			iconRef:			IconRef_GAP_Private_field_type_fix;
 			);
 		4: (
 			picture:			PicHandle;
@@ -149034,7 +149060,7 @@ type
 	ControlDataAccessRec = record
 		tag: ResType;
 		part: ResType;
-		size: Size;
+		size: Size_GAP_Private_field_type_fix;
 		dataPtr: Ptr;
 	end;
 type
@@ -171312,8 +171338,8 @@ type
 	HICommand = record
 		attributes: UInt32;
 		commandID: UInt32;
-		menuRef: MenuRef;
-		menuItemIndex: MenuItemIndex;
+		menuRef: MenuRef_GAP_Private_field_type_fix;
+		menuItemIndex: MenuItemIndex_GAP_Private_field_type_fix;
 	end;
 	HICommandPtr = ^HICommand;
 type
@@ -171328,8 +171354,8 @@ type
 			window: WindowRef;
 		);
 		2: (
-			menuRef: MenuRef;
-			menuItemIndex: MenuItemIndex;
+			menuRef: MenuRef_GAP_Private_field_type_fix;
+			menuItemIndex: MenuItemIndex_GAP_Private_field_type_fix;
 		 );
 	end;
 	HICommandExtendedPtr = ^HICommandExtended;
@@ -179283,7 +179309,7 @@ type
 			iconSuite: IconSuiteRef;
 			);
 		1: (
-			iconRef: IconRef;
+			iconRef: IconRef_GAP_Private_field_type_fix;
 			);
 		2: (
 			imageRef: CGImageRef;
@@ -185605,6 +185631,7 @@ type
  }
 type
 	WindowClass = UInt32;
+	WindowClass_GAP_Private_field_type_fix = WindowClass; { used as field type when a record declaration contains a WindowClass field identifier }
 const
 {
    * An alert window is used when the application needs the user's
@@ -185857,6 +185884,7 @@ const
 
 type
 	WindowAttributes = UInt32;
+	WindowAttributes_GAP_Private_field_type_fix = WindowAttributes; { used as field type when a record declaration contains a WindowAttributes field identifier }
 
 {
  *  Summary:
@@ -186273,6 +186301,7 @@ const
  }
 type
 	WindowPositionMethod = UInt32;
+	WindowPositionMethod_GAP_Private_field_type_fix = WindowPositionMethod; { used as field type when a record declaration contains a WindowPositionMethod field identifier }
 const
 {
    * Centers the window on the main screen.
@@ -186710,7 +186739,7 @@ type
 		windowZoomRect: Rect;         { location on screen when zoomed out}
 		windowRefCon: UInt32;           { the refcon - __avoid saving stale pointers here__  }
 		windowStateFlags: UInt32;       { window state bit flags}
-		windowPositionMethod: WindowPositionMethod; { method last used by RepositionWindow to position the window (if any)}
+		windowPositionMethod: WindowPositionMethod_GAP_Private_field_type_fix; { method last used by RepositionWindow to position the window (if any)}
 
 		windowDefinitionVersion: UInt32;
 		case SInt16 of
@@ -186719,8 +186748,8 @@ type
 			windowHasCloseBox:	Boolean;
 		   );
 		1: (
-			windowClass:		WindowClass;							{  the class }
-			windowAttributes:	WindowAttributes;						{  the attributes }
+			windowClass:		WindowClass_GAP_Private_field_type_fix;	{  the class }
+			windowAttributes:	WindowAttributes_GAP_Private_field_type_fix;						{  the attributes }
 		   );
 	end;
 {  the window manager stores the default collection items using these IDs}
@@ -194802,10 +194831,10 @@ const
 type
 	NavTypeListPtr = ^NavTypeList;
 	NavTypeList = record
-		componentSignature:		OSType;
+		componentSignature:		OSType_GAP_Private_field_type_fix;
 		reserved:				SInt16;
 		osTypeCount:			SInt16;
-		osType:					array [0..0] of OSType;
+		osType:					array [0..0] of OSType_GAP_Private_field_type_fix;
 	end;
 
 	NavTypeListHandle					= ^NavTypeListPtr;
@@ -204784,6 +204813,7 @@ const
 
 type
 	CodecType							= OSType;
+	CodecType_GAP_Private_field_type_fix = CodecType; { used as field type when a record declaration contains a CodecType field identifier }
 	CodecFlags							= UInt16;
 	CodecQ								= UInt32;
 
@@ -236090,6 +236120,7 @@ type
 	end;
 
 	Movie								= ^MovieRecord;
+	Movie_GAP_Private_field_type_fix	= Movie; { used as field type when a record declaration contains a Movie field identifier }
 	MoviePtr							= ^Movie;
 	TrackRecordPtr = ^TrackRecord;
 	TrackRecord = record
@@ -236097,6 +236128,7 @@ type
 	end;
 
 	Track								= ^TrackRecord;
+	Track_GAP_Private_field_type_fix	= Track; { used as field type when a record declaration contains a Track field identifier }
 	MediaRecordPtr = ^MediaRecord;
 	MediaRecord = record
 		data:					array [0..0] of SInt32;
@@ -245399,6 +245431,7 @@ type
 		size:					SInt32;
 		atomType:				SInt32;
 	end;
+	MediaInfo_GAP_Private_field_type_fix = MediaInfo; { used as field type when a record declaration contains a MediaInfo field identifier }
 
 	{	**********************
 	* Media Directory Structures
@@ -245427,7 +245460,7 @@ type
 		atomType:				SInt32;								{  = 'mdia'  }
 		mediaHeader:			MediaHeaderAtom;						{  standard Media information  }
 		mediaHandler:			HandlerAtom;
-		mediaInfo:				MediaInfo;
+		mediaInfo:				MediaInfo_GAP_Private_field_type_fix;
 	end;
 
 	{	**********************
@@ -245516,6 +245549,7 @@ type
 		media:					MediaDirectory;
 		userData:				UserDataAtom;							{  space for extending with new data types  }
 	end;
+	TrackDirectory_GAP_Private_field_type_fix = TrackDirectory; { used as field type when a record declaration contains a TrackDirectory field identifier }
 
 	{	***************************************
 	*
@@ -245556,7 +245590,7 @@ type
 
 	TrackDirectoryEntryPtr = ^TrackDirectoryEntry;
 	TrackDirectoryEntry = record
-		trackDirectory:			TrackDirectory;							{  Track directory information  }
+		trackDirectory:			TrackDirectory_GAP_Private_field_type_fix;							{  Track directory information  }
 	end;
 
 	MovieDirectoryPtr = ^MovieDirectory;
@@ -250019,7 +250053,7 @@ type
 	QTVRCursorRecord = record
 		theType:				UInt16;									{  field was previously named "type" }
 		rsrcID:					SInt16;
-		handle:					Handle;
+		handle:					Handle_GAP_Private_field_type_fix;
 	end;
 
 	QTVRFloatPointPtr = ^QTVRFloatPoint;
@@ -254573,7 +254607,7 @@ type
 		trackDuration:			TimeValue;
 		mediaDuration:			TimeValue;
 		effectiveRate:			Fixed;
-		timeBase:				TimeBase;
+		timeBase:				TimeBase_GAP_Private_field_type_fix;
 		volume:					SInt16;
 		width:					Fixed;
 		height:					Fixed;
@@ -254611,12 +254645,12 @@ type
 
 	QTCustomActionTargetRecordPtr = ^QTCustomActionTargetRecord;
 	QTCustomActionTargetRecord = record
-		movie:					Movie;
+		movie:					Movie_GAP_Private_field_type_fix;
 		doMCActionCallbackProc:	DoMCActionUPP;
 		callBackRefcon:			SInt32;
-		track:					Track;
+		track:					Track_GAP_Private_field_type_fix;
 		trackObjectRefCon:		SInt32;
-		defaultTrack:			Track;
+		defaultTrack:			Track_GAP_Private_field_type_fix;
 		defaultObjectRefCon:	SInt32;
 		reserved1:				SInt32;
 		reserved2:				SInt32;
@@ -256407,7 +256441,7 @@ const
 type
 	SCSpatialSettingsPtr = ^SCSpatialSettings;
 	SCSpatialSettings = record
-		codecType:				CodecType;
+		codecType:				CodecType_GAP_Private_field_type_fix;
 		codec:					CodecComponent;
 		depth:					SInt16;
 		spatialQuality:			CodecQ;
@@ -256840,6 +256874,7 @@ type
 		numFrames:				SInt8;									{  frames/sec for timecode (eg. 30) OR frames/tick for counter mode }
 		padding:				SInt8;									{  unused padding byte }
 	end;
+	TimeCodeDef_GAP_Private_field_type_fix = TimeCodeDef; { used as field type when a record declaration contains a TimeCodeDef field identifier }
 
 
 const
@@ -256879,7 +256914,7 @@ type
 		resvd2:					SInt16;
 		dataRefIndex:			SInt16;
 		flags:					SInt32;								{  timecode specific stuff }
-		timeCodeDef:			TimeCodeDef;
+		timeCodeDef:			TimeCodeDef_GAP_Private_field_type_fix;
 		srcRef:					array [0..0] of SInt32;
 	end;
 
@@ -260209,7 +260244,7 @@ type
 			number:				SInt32;									{     The value when valueKind is attributeValueKindInteger or attributeValueKindPercent }
 			);
 		1: (
-			boolean:			boolean;								{     The value when valueKind is attributeValueKindBoolean or attributeValueKindOnOff }
+			boolean:			boolean_GAP_Private_field_type_fix;		{     The value when valueKind is attributeValueKindBoolean or attributeValueKindOnOff }
 			);
 		2: (
 			color:				RGBColor;								{     The value when valueKind is attributeValueKindColor }
@@ -263892,7 +263927,7 @@ type
 		height:					Fixed;
 		matrix:					MatrixRecord;
 		gWorld:					CGrafPtr;
-		gdHandle:				GDHandle;
+		gdHandle:				GDHandle_GAP_Private_field_type_fix;
 		clip:					RgnHandle;
 		graphicsMode:			SInt16;
 		opColor:				RGBColor;
@@ -264046,7 +264081,7 @@ type
 		dataLength:				UInt32;
 		editList:				QTSEditListHandle;
 		flags:					SInt32;
-		timeScale:				TimeScale;								{  set to 0 for default timescale  }
+		timeScale:				TimeScale_GAP_Private_field_type_fix;	{  set to 0 for default timescale  }
 		mediaParams:			QTSMediaParamsPtr;
 		notificationProc:		QTSNotificationUPP;
 		notificationRefCon:		Ptr;
@@ -264057,7 +264092,7 @@ type
 		version:				UInt32;
 		editList:				QTSEditListHandle;
 		flags:					SInt32;
-		timeScale:				TimeScale;								{  set to 0 for default timescale  }
+		timeScale:				TimeScale_GAP_Private_field_type_fix;	{  set to 0 for default timescale  }
 		mediaParams:			QTSMediaParamsPtr;
 		notificationProc:		QTSNotificationUPP;
 		notificationRefCon:		Ptr;
@@ -265113,7 +265148,7 @@ type
 	QTSDurationAtomPtr = ^QTSDurationAtom;
 	QTSDurationAtom = record
 		versionAndFlags:		SInt32;
-		timeScale:				TimeScale;
+		timeScale:				TimeScale_GAP_Private_field_type_fix;
 		duration:				TimeValue64;
 	end;
 
@@ -266017,7 +266052,7 @@ type
 	QTSTrackParams = record
 		version:				SInt32;
 		flags:					SInt32;
-		track:					Track;
+		track:					Track_GAP_Private_field_type_fix;
 		trackStartOffset:		TimeValue64;							{  to start other than at the beginning otherwise set to 0 }
 		duration:				TimeValue64;							{  to limit the duration otherwise set to 0 }
 		loopParams:				QTSLoopParamsPtr;						{  set to NULL if not using; default is no looping  }
@@ -266033,7 +266068,7 @@ type
 	QTSSourcerTimingParams = record
 		version:				SInt32;
 		flags:					SInt32;
-		timeScale:				TimeScale;
+		timeScale:				TimeScale_GAP_Private_field_type_fix;
 		presentationStartTime:	TimeValue64;
 		presentationEndTime:	TimeValue64;
 		presentationCurrentTime: TimeValue64;
@@ -266444,8 +266479,8 @@ type
 		reserved1:				SInt8;
 		reserved2:				SInt8;
 		reserved3:				SInt8;
-		timeBase:				TimeBase;
-		timeScale:				TimeScale;
+		timeBase:				TimeBase_GAP_Private_field_type_fix;
+		timeScale:				TimeScale_GAP_Private_field_type_fix;
 	end;
 
 	RTPDescParamsPtr = ^RTPDescParams;
@@ -267855,7 +267890,7 @@ end;
 
 function CFSwapInt64( arg: UInt64 ): UInt64; inline;
 begin
-	CFSwapInt64 := (CFSwapInt32( arg and $FFFFFFFF ) shl 32) or CFSwapInt32( (arg shr 32) and $FFFFFFFF );
+	CFSwapInt64 := (UInt64(CFSwapInt32( arg and $FFFFFFFF )) shl 32) or CFSwapInt32( (arg shr 32) and $FFFFFFFF );
 end;
 
 {$ifc TARGET_RT_BIG_ENDIAN}

packages/extra/univint/HIView.pas

@@ -557,7 +557,7 @@ type
 			iconSuite: IconSuiteRef;
 			);
 		1: (
-			iconRef: IconRef;
+			iconRef: IconRef_GAP_Private_field_type_fix;
 			);
 		2: (
 			imageRef: CGImageRef;

packages/extra/univint/Icons.pas

@@ -467,6 +467,7 @@ type
 	end;
 
 	CIconHandle							= ^CIconPtr;
+	CIconHandle_GAP_Private_field_type_fix = CIconHandle; { used as field type when a record declaration contains a CIconHandle field identifier }
 	{
 	 *  GetCIcon()
 	 *  
@@ -523,6 +524,7 @@ type
 	IconCacheRef						= Handle;
 	{  IconRefs are 32-bit values identifying cached icon data. IconRef 0 is invalid. }
 	IconRef    = ^SInt32; { an opaque 32-bit type }
+	IconRef_GAP_Private_field_type_fix = IconRef; { used as field type when a record declaration contains a IconRef field identifier }
 	IconRefPtr = ^IconRef;  { when a var xx:IconRef parameter can be nil, it is changed to xx: IconRefPtr }
 	{
 	 *  PlotIconID()

packages/extra/univint/ImageCompression.pas

@@ -326,6 +326,7 @@ const
 
 type
 	CodecType							= OSType;
+	CodecType_GAP_Private_field_type_fix = CodecType; { used as field type when a record declaration contains a CodecType field identifier }
 	CodecFlags							= UInt16;
 	CodecQ								= UInt32;
 

packages/extra/univint/MacTypes.pas

@@ -293,7 +293,9 @@ type
 	Ptr = ^SInt8;
 	PtrPtr = ^Ptr;       
 	Handle = ^Ptr;
+	Handle_GAP_Private_field_type_fix = Handle; { used as field type when a record declaration contains a Handle field identifier }
 	Size = SInt32;
+	Size_GAP_Private_field_type_fix = Size; { used as field type when a record declaration contains a Size field identifier }
 	SizePtr = ^Size;
 	UnivPtr = Pointer;
 	UnivPtrPtr = ^UnivPtr;
@@ -351,6 +353,7 @@ type
  	RegionCodePtr = ^RegionCode;
 	FourCharCode = UInt32;
 	OSType = FourCharCode;
+	OSType_GAP_Private_field_type_fix = OSType; { used as field type when a record declaration contains a OSType field identifier }
 	ResType = FourCharCode;
 	OSTypePtr = ^OSType;
 	ResTypePtr = ^ResType;
@@ -367,6 +370,7 @@ type
 type
 { "Boolean", "true", and "false" are built into the Pascal language }
 	BooleanPtr = ^Boolean;
+	boolean_GAP_Private_field_type_fix = boolean; { used as field type when a record declaration contains a boolean field identifier }
 {*******************************************************************************
 
     Function Pointer Types
@@ -612,6 +616,7 @@ const
 
 type
 	Style = SInt8;
+	Style_GAP_Private_field_type_fix = Style; { used as field type when a record declaration contains a Style field identifier }
 	StyleParameter = SInt16;
 	StyleField = Style;
 
@@ -631,11 +636,13 @@ type
 type
 	TimeValue = SInt32;
 	TimeScale = SInt32;
+	TimeScale_GAP_Private_field_type_fix = TimeScale; { used as field type when a record declaration contains a TimeScale field identifier }
 	CompTimeValue = wide;
 	CompTimeValuePtr = ^CompTimeValue;
 	TimeValue64 = SInt64;
 	TimeValue64Ptr = ^TimeValue64;
 	TimeBase = ^SInt32; { an opaque 32-bit type }
+	TimeBase_GAP_Private_field_type_fix = TimeBase; { used as field type when a record declaration contains a TimeBase field identifier }
 	TimeBasePtr = ^TimeBase;
 	TimeRecord = record
 		value: CompTimeValue;                  { units (duration or absolute) }

packages/extra/univint/MacWindows.pas

@@ -141,6 +141,7 @@ type
  }
 type
 	WindowClass = UInt32;
+	WindowClass_GAP_Private_field_type_fix = WindowClass; { used as field type when a record declaration contains a WindowClass field identifier }
 const
 {
    * An alert window is used when the application needs the user's
@@ -393,6 +394,7 @@ const
 
 type
 	WindowAttributes = UInt32;
+	WindowAttributes_GAP_Private_field_type_fix = WindowAttributes; { used as field type when a record declaration contains a WindowAttributes field identifier }
 
 {
  *  Summary:
@@ -809,6 +811,7 @@ const
  }
 type
 	WindowPositionMethod = UInt32;
+	WindowPositionMethod_GAP_Private_field_type_fix = WindowPositionMethod; { used as field type when a record declaration contains a WindowPositionMethod field identifier }
 const
 {
    * Centers the window on the main screen.
@@ -1246,7 +1249,7 @@ type
 		windowZoomRect: Rect;         { location on screen when zoomed out}
 		windowRefCon: UInt32;           { the refcon - __avoid saving stale pointers here__  }
 		windowStateFlags: UInt32;       { window state bit flags}
-		windowPositionMethod: WindowPositionMethod; { method last used by RepositionWindow to position the window (if any)}
+		windowPositionMethod: WindowPositionMethod_GAP_Private_field_type_fix; { method last used by RepositionWindow to position the window (if any)}
 
 		windowDefinitionVersion: UInt32;
 		case SInt16 of
@@ -1255,8 +1258,8 @@ type
 			windowHasCloseBox:	Boolean;
 		   );
 		1: (
-			windowClass:		WindowClass;							{  the class }
-			windowAttributes:	WindowAttributes;						{  the attributes }
+			windowClass:		WindowClass_GAP_Private_field_type_fix;	{  the class }
+			windowAttributes:	WindowAttributes_GAP_Private_field_type_fix;						{  the attributes }
 		   );
 	end;
 {  the window manager stores the default collection items using these IDs}

packages/extra/univint/MediaHandlers.pas

@@ -186,7 +186,7 @@ type
 		trackDuration:			TimeValue;
 		mediaDuration:			TimeValue;
 		effectiveRate:			Fixed;
-		timeBase:				TimeBase;
+		timeBase:				TimeBase_GAP_Private_field_type_fix;
 		volume:					SInt16;
 		width:					Fixed;
 		height:					Fixed;
@@ -224,12 +224,12 @@ type
 
 	QTCustomActionTargetRecordPtr = ^QTCustomActionTargetRecord;
 	QTCustomActionTargetRecord = record
-		movie:					Movie;
+		movie:					Movie_GAP_Private_field_type_fix;
 		doMCActionCallbackProc:	DoMCActionUPP;
 		callBackRefcon:			SInt32;
-		track:					Track;
+		track:					Track_GAP_Private_field_type_fix;
 		trackObjectRefCon:		SInt32;
-		defaultTrack:			Track;
+		defaultTrack:			Track_GAP_Private_field_type_fix;
 		defaultObjectRefCon:	SInt32;
 		reserved1:				SInt32;
 		reserved2:				SInt32;

packages/extra/univint/Menus.pas

@@ -819,10 +819,12 @@ type
 	MenuID = SInt16;
 type
 	MenuItemIndex = UInt16;
+	MenuItemIndex_GAP_Private_field_type_fix = MenuItemIndex; { used as field type when a record declaration contains a MenuItemIndex field identifier }
 	MenuItemIndexPtr = ^MenuItemIndex;
 	MenuCommand = UInt32;
 type
 	MenuRef = ^SInt32; { an opaque 32-bit type }
+	MenuRef_GAP_Private_field_type_fix = MenuRef; { used as field type when a record declaration contains a MenuRef field identifier }
 	MenuRefPtr = ^MenuRef;
 { MenuHandle is old name for MenuRef}
 type
@@ -1281,7 +1283,7 @@ type
 		cmdKey: UniChar;
 		cmdKeyGlyph: UInt32;
 		cmdKeyModifiers: UInt32;
-		style: Style;
+		style: Style_GAP_Private_field_type_fix;
 		enabled: Boolean;
 		iconEnabled: Boolean;
 		filler1: SInt8;

packages/extra/univint/Movies.pas

@@ -208,6 +208,7 @@ type
 	end;
 
 	Movie								= ^MovieRecord;
+	Movie_GAP_Private_field_type_fix	= Movie; { used as field type when a record declaration contains a Movie field identifier }
 	MoviePtr							= ^Movie;
 	TrackRecordPtr = ^TrackRecord;
 	TrackRecord = record
@@ -215,6 +216,7 @@ type
 	end;
 
 	Track								= ^TrackRecord;
+	Track_GAP_Private_field_type_fix	= Track; { used as field type when a record declaration contains a Track field identifier }
 	MediaRecordPtr = ^MediaRecord;
 	MediaRecord = record
 		data:					array [0..0] of SInt32;

packages/extra/univint/MoviesFormat.pas

@@ -367,6 +367,7 @@ type
 		size:					SInt32;
 		atomType:				SInt32;
 	end;
+	MediaInfo_GAP_Private_field_type_fix = MediaInfo; { used as field type when a record declaration contains a MediaInfo field identifier }
 
 	{	**********************
 	* Media Directory Structures
@@ -395,7 +396,7 @@ type
 		atomType:				SInt32;								{  = 'mdia'  }
 		mediaHeader:			MediaHeaderAtom;						{  standard Media information  }
 		mediaHandler:			HandlerAtom;
-		mediaInfo:				MediaInfo;
+		mediaInfo:				MediaInfo_GAP_Private_field_type_fix;
 	end;
 
 	{	**********************
@@ -484,6 +485,7 @@ type
 		media:					MediaDirectory;
 		userData:				UserDataAtom;							{  space for extending with new data types  }
 	end;
+	TrackDirectory_GAP_Private_field_type_fix = TrackDirectory; { used as field type when a record declaration contains a TrackDirectory field identifier }
 
 	{	***************************************
 	*
@@ -524,7 +526,7 @@ type
 
 	TrackDirectoryEntryPtr = ^TrackDirectoryEntry;
 	TrackDirectoryEntry = record
-		trackDirectory:			TrackDirectory;							{  Track directory information  }
+		trackDirectory:			TrackDirectory_GAP_Private_field_type_fix;							{  Track directory information  }
 	end;
 
 	MovieDirectoryPtr = ^MovieDirectory;

packages/extra/univint/Navigation.pas

@@ -563,10 +563,10 @@ const
 type
 	NavTypeListPtr = ^NavTypeList;
 	NavTypeList = record
-		componentSignature:		OSType;
+		componentSignature:		OSType_GAP_Private_field_type_fix;
 		reserved:				SInt16;
 		osTypeCount:			SInt16;
-		osType:					array [0..0] of OSType;
+		osType:					array [0..0] of OSType_GAP_Private_field_type_fix;
 	end;
 
 	NavTypeListHandle					= ^NavTypeListPtr;

packages/extra/univint/QTStreamingComponents.pas

@@ -221,7 +221,7 @@ type
 	QTSTrackParams = record
 		version:				SInt32;
 		flags:					SInt32;
-		track:					Track;
+		track:					Track_GAP_Private_field_type_fix;
 		trackStartOffset:		TimeValue64;							{  to start other than at the beginning otherwise set to 0 }
 		duration:				TimeValue64;							{  to limit the duration otherwise set to 0 }
 		loopParams:				QTSLoopParamsPtr;						{  set to NULL if not using; default is no looping  }
@@ -237,7 +237,7 @@ type
 	QTSSourcerTimingParams = record
 		version:				SInt32;
 		flags:					SInt32;
-		timeScale:				TimeScale;
+		timeScale:				TimeScale_GAP_Private_field_type_fix;
 		presentationStartTime:	TimeValue64;
 		presentationEndTime:	TimeValue64;
 		presentationCurrentTime: TimeValue64;
@@ -648,8 +648,8 @@ type
 		reserved1:				SInt8;
 		reserved2:				SInt8;
 		reserved3:				SInt8;
-		timeBase:				TimeBase;
-		timeScale:				TimeScale;
+		timeBase:				TimeBase_GAP_Private_field_type_fix;
+		timeScale:				TimeScale_GAP_Private_field_type_fix;
 	end;
 
 	RTPDescParamsPtr = ^RTPDescParams;

packages/extra/univint/QuickTimeComponents.pas

@@ -289,7 +289,7 @@ const
 type
 	SCSpatialSettingsPtr = ^SCSpatialSettings;
 	SCSpatialSettings = record
-		codecType:				CodecType;
+		codecType:				CodecType_GAP_Private_field_type_fix;
 		codec:					CodecComponent;
 		depth:					SInt16;
 		spatialQuality:			CodecQ;
@@ -722,6 +722,7 @@ type
 		numFrames:				SInt8;									{  frames/sec for timecode (eg. 30) OR frames/tick for counter mode }
 		padding:				SInt8;									{  unused padding byte }
 	end;
+	TimeCodeDef_GAP_Private_field_type_fix = TimeCodeDef; { used as field type when a record declaration contains a TimeCodeDef field identifier }
 
 
 const
@@ -761,7 +762,7 @@ type
 		resvd2:					SInt16;
 		dataRefIndex:			SInt16;
 		flags:					SInt32;								{  timecode specific stuff }
-		timeCodeDef:			TimeCodeDef;
+		timeCodeDef:			TimeCodeDef_GAP_Private_field_type_fix;
 		srcRef:					array [0..0] of SInt32;
 	end;
 
@@ -4091,7 +4092,7 @@ type
 			number:				SInt32;									{     The value when valueKind is attributeValueKindInteger or attributeValueKindPercent }
 			);
 		1: (
-			boolean:			boolean;								{     The value when valueKind is attributeValueKindBoolean or attributeValueKindOnOff }
+			boolean:			boolean_GAP_Private_field_type_fix;		{     The value when valueKind is attributeValueKindBoolean or attributeValueKindOnOff }
 			);
 		2: (
 			color:				RGBColor;								{     The value when valueKind is attributeValueKindColor }

packages/extra/univint/QuickTimeStreaming.pas

@@ -403,7 +403,7 @@ type
 		height:					Fixed;
 		matrix:					MatrixRecord;
 		gWorld:					CGrafPtr;
-		gdHandle:				GDHandle;
+		gdHandle:				GDHandle_GAP_Private_field_type_fix;
 		clip:					RgnHandle;
 		graphicsMode:			SInt16;
 		opColor:				RGBColor;
@@ -557,7 +557,7 @@ type
 		dataLength:				UInt32;
 		editList:				QTSEditListHandle;
 		flags:					SInt32;
-		timeScale:				TimeScale;								{  set to 0 for default timescale  }
+		timeScale:				TimeScale_GAP_Private_field_type_fix;	{  set to 0 for default timescale  }
 		mediaParams:			QTSMediaParamsPtr;
 		notificationProc:		QTSNotificationUPP;
 		notificationRefCon:		Ptr;
@@ -568,7 +568,7 @@ type
 		version:				UInt32;
 		editList:				QTSEditListHandle;
 		flags:					SInt32;
-		timeScale:				TimeScale;								{  set to 0 for default timescale  }
+		timeScale:				TimeScale_GAP_Private_field_type_fix;	{  set to 0 for default timescale  }
 		mediaParams:			QTSMediaParamsPtr;
 		notificationProc:		QTSNotificationUPP;
 		notificationRefCon:		Ptr;
@@ -1624,7 +1624,7 @@ type
 	QTSDurationAtomPtr = ^QTSDurationAtom;
 	QTSDurationAtom = record
 		versionAndFlags:		SInt32;
-		timeScale:				TimeScale;
+		timeScale:				TimeScale_GAP_Private_field_type_fix;
 		duration:				TimeValue64;
 	end;
 

packages/extra/univint/QuickTimeVR.pas

@@ -353,7 +353,7 @@ type
 	QTVRCursorRecord = record
 		theType:				UInt16;									{  field was previously named "type" }
 		rsrcID:					SInt16;
-		handle:					Handle;
+		handle:					Handle_GAP_Private_field_type_fix;
 	end;
 
 	QTVRFloatPointPtr = ^QTVRFloatPoint;

packages/extra/univint/Quickdraw.pas

@@ -1390,6 +1390,7 @@ type
 	GDevicePtr = ^GDevice;
 	GDPtr								= ^GDevice;
 	GDHandle							= ^GDPtr;
+	GDHandle_GAP_Private_field_type_fix	= GDHandle; { used as field type when a record declaration contains a GDHandle field identifier }
 	GDHandlePtr							= ^GDHandle; { when a VAR xx: GDHandle parameter can be nil, it is changed to xx: GDHandlePtr }
 	GDevice = record
 		gdRefNum:				SInt16;								{ driver's unit number }

packages/extra/univint/TextCommon.pas

@@ -429,6 +429,7 @@ const
 
 type
 	TextEncoding						= UInt32;
+	TextEncoding_GAP_Private_field_type_fix = TextEncoding; { used as field type when a record declaration contains a TextEncoding field identifier }
 	TextEncodingPtr						= ^TextEncoding; { when a VAR xx: TextEncoding parameter can be nil, it is changed to xx: TextEncodingPtr }
 	{  name part selector for GetTextEncodingName }
 	TextEncodingNameSelector			= UInt32;
@@ -445,7 +446,7 @@ type
 	TextEncodingRunPtr = ^TextEncodingRun;
 	TextEncodingRun = record
 		offset:					ByteOffset;
-		textEncoding:			TextEncoding;
+		textEncoding:			TextEncoding_GAP_Private_field_type_fix;
 	end;
 
 	ConstTextEncodingRunPtr				= ^TextEncodingRun;

packages/extra/univint/USB.pas

@@ -142,7 +142,9 @@ const
 
 type
 	USBReference						= SInt32;
+	USBReference_GAP_Private_field_type_fix	= USBReference; { used as field type when a record declaration contains a USBReference field identifier }
 	USBDeviceRef						= USBReference;
+	USBDeviceRef_GAP_Private_field_type_fix	= USBDeviceRef; { used as field type when a record declaration contains a USBDeviceRef field identifier }
 	USBDeviceRefPtr						= ^USBDeviceRef;
 	USBInterfaceRef						= USBReference;
 	USBPipeRef							= USBReference;
@@ -150,6 +152,7 @@ type
 	USBPipeState						= UInt32;
 	USBCount							= UInt32;
 	USBFlags							= UInt32;
+	USBFlags_GAP_Private_field_type_fix	= USBFlags; { used as field type when a record declaration contains a USBFlags field identifier }
 	USBRequest							= UInt8;
 	USBDirection						= UInt8;
 	USBRqRecipient						= UInt8;
@@ -195,8 +198,10 @@ type
 	USBPBPtr = ^USBPB;
 {$ifc TYPED_FUNCTION_POINTERS}
 	USBCompletion = procedure(pb: USBPBPtr);
+	USBCompletion_GAP_Private_field_type_fix = USBCompletion; { used as field type when a record declaration contains a USBCompletion field identifier }
 {$elsec}
 	USBCompletion = ProcPtr;
+	USBCompletion_GAP_Private_field_type_fix = USBCompletion; { used as field type when a record declaration contains a USBCompletion field identifier }
 {$endc}
 
 	USBVariantBitsPtr = ^USBVariantBits;
@@ -221,13 +226,13 @@ type
 		reserved1:				UInt16;
 		reserved2:				UInt32;
 		usbStatus:				OSStatus;
-		usbCompletion:			USBCompletion;
+		usbCompletion:			USBCompletion_GAP_Private_field_type_fix;
 		usbRefcon:				UInt32;
-		usbReference:			USBReference;
+		usbReference:			USBReference_GAP_Private_field_type_fix;
 		usbBuffer:				Ptr;
 		usbReqCount:			USBCount;
 		usbActCount:			USBCount;
-		usbFlags:				USBFlags;
+		usbFlags:				USBFlags_GAP_Private_field_type_fix;
 		usb:					USBVariantBits;
 		usbFrame:				UInt32;
 		usbClassType:			UInt8;
@@ -1154,7 +1159,7 @@ type
 		pbVersion:				UInt16;
 		usbDeviceNotification:	SInt8;
 		reserved1:				SInt8;									{  needed because of 2-byte 68k alignment }
-		usbDeviceRef:			USBDeviceRef;
+		usbDeviceRef:			USBDeviceRef_GAP_Private_field_type_fix;
 		usbClass:				UInt16;
 		usbSubClass:			UInt16;
 		usbProtocol:			UInt16;
@@ -1636,8 +1641,10 @@ const
 
 type
 	USBDriverDescVersion				= UInt32;
+	USBDriverDescVersion_GAP_Private_field_type_fix	= USBDriverDescVersion; { used as field type when a record declaration contains a USBDriverDescVersion field identifier }
 	{   Driver Loading Options }
 	USBDriverLoadingOptions 	= UInt32;
+	USBDriverLoadingOptions_GAP_Private_field_type_fix = USBDriverLoadingOptions; { used as field type when a record declaration contains a USBDriverLoadingOptions field identifier }
 const
 	kUSBDoNotMatchGenericDevice	= $00000001;					{  Driver's VendorID must match Device's VendorID }
 	kUSBDoNotMatchInterface		= $00000002;					{  Do not load this driver as an interface driver. }
@@ -1655,6 +1662,7 @@ type
 		usbDeviceReleaseNumber:	UInt16;									{  Release Number of Device }
 		usbDeviceProtocol:		UInt16;									{  Protocol Info. }
 	end;
+	USBDeviceInfo_GAP_Private_field_type_fix = USBDeviceInfo; { used as field type when a record declaration contains a USBDeviceInfo field identifier }
 
 	USBInterfaceInfoPtr = ^USBInterfaceInfo;
 	USBInterfaceInfo = record
@@ -1665,6 +1673,7 @@ type
 		usbInterfaceProtocol:	SInt8;									{  Interface Protocol }
 		pad:					SInt8
 	end;
+	USBInterfaceInfo_GAP_Private_field_type_fix = USBInterfaceInfo; { used as field type when a record declaration contains a USBInterfaceInfo field identifier }
 
 	USBDriverTypePtr = ^USBDriverType;
 	USBDriverType = record
@@ -1673,15 +1682,16 @@ type
 		usbDriverSubClass:		SInt8;									{  Module type }
 		usbDriverVersion:		NumVersion;								{  Class driver version number. }
 	end;
+	USBDriverType_GAP_Private_field_type_fix = USBDriverType; { used as field type when a record declaration contains a USBDriverType field identifier }
 
 	USBDriverDescriptionPtr = ^USBDriverDescription;
 	USBDriverDescription = record
 		usbDriverDescSignature:	OSType;									{  Signature field of this structure. }
-		usbDriverDescVersion:	USBDriverDescVersion;					{  Version of this data structure. }
-		usbDeviceInfo:			USBDeviceInfo;							{  Product & Vendor Info }
-		usbInterfaceInfo:		USBInterfaceInfo;						{  Interface info }
-		usbDriverType:			USBDriverType;							{  Driver Info. }
-		usbDriverLoadingOptions: USBDriverLoadingOptions;				{  Options for class driver loading. }
+		usbDriverDescVersion:	USBDriverDescVersion_GAP_Private_field_type_fix; {  Version of this data structure. }
+		usbDeviceInfo:			USBDeviceInfo_GAP_Private_field_type_fix; {  Product & Vendor Info }
+		usbInterfaceInfo:		USBInterfaceInfo_GAP_Private_field_type_fix; {  Interface info }
+		usbDriverType:			USBDriverType_GAP_Private_field_type_fix; {  Driver Info. }
+		usbDriverLoadingOptions: USBDriverLoadingOptions_GAP_Private_field_type_fix; {  Options for class driver loading. }
 	end;
 
 	{
@@ -1760,6 +1770,7 @@ const
 
 type
 	USBShimDescVersion 			= UInt32;
+	USBShimDescVersion_GAP_Private_field_type_fix = USBShimDescVersion; { used as field type when a record declaration contains a USBShimDescVersion field identifier }
 const
 	kCurrentUSBShimDescVers		= $0100;
 
@@ -1775,7 +1786,7 @@ type
 	USBShimDescriptionPtr = ^USBShimDescription;
 	USBShimDescription = record
 		usbShimDescSignature:	OSType;									{  Signature field of this structure. }
-		usbShimDescVersion:		USBShimDescVersion;						{  Version of this data structure. }
+		usbShimDescVersion:		USBShimDescVersion_GAP_Private_field_type_fix; {  Version of this data structure. }
 		usbDriverLoadingOptions: USBShimLoadingOptions;					{  Options for shim loading. }
 		libraryName:			Str63;									{  For optional shared library registration }
 	end;