Browse Source

* PChar -> PAnsiChar

Michaël Van Canneyt 2 years ago
parent
commit
26d7067c51
61 changed files with 282 additions and 282 deletions
  1. 1 1
      packages/univint/src/AudioCodecs.pas
  2. 8 8
      packages/univint/src/AudioFile.pas
  3. 6 6
      packages/univint/src/AudioFileComponents.pas
  4. 1 1
      packages/univint/src/AudioFileStream.pas
  5. 1 1
      packages/univint/src/AudioFormat.pas
  6. 2 2
      packages/univint/src/AudioHardwareBase.pas
  7. 1 1
      packages/univint/src/AudioHardwareDeprecated.pas
  8. 2 2
      packages/univint/src/AudioUnitCarbonViews.pas
  9. 1 1
      packages/univint/src/AudioUnitProperties.pas
  10. 1 1
      packages/univint/src/AudioUnitUtilities.pas
  11. 1 1
      packages/univint/src/Authorization.pas
  12. 8 8
      packages/univint/src/CFBundle.pas
  13. 3 3
      packages/univint/src/CFString.pas
  14. 1 1
      packages/univint/src/CFStringEncodingExt.pas
  15. 1 1
      packages/univint/src/CSIdentityBase.pas
  16. 5 5
      packages/univint/src/ColorSyncDeprecated.pas
  17. 1 1
      packages/univint/src/ConditionalMacros.pas
  18. 5 5
      packages/univint/src/CoreAudioTypes.pas
  19. 1 1
      packages/univint/src/DateTimeUtils.pas
  20. 4 4
      packages/univint/src/Debugging.pas
  21. 5 5
      packages/univint/src/Files.pas
  22. 2 2
      packages/univint/src/Fonts.pas
  23. 24 24
      packages/univint/src/GPCStrings.pas
  24. 1 1
      packages/univint/src/HITextViews.pas
  25. 4 4
      packages/univint/src/ICAApplication.pas
  26. 30 30
      packages/univint/src/IntlResources.pas
  27. 1 1
      packages/univint/src/Lists.pas
  28. 1 1
      packages/univint/src/MacMemory.pas
  29. 4 4
      packages/univint/src/MacOSAll.pas
  30. 1 1
      packages/univint/src/MacOpenGL.pas
  31. 7 7
      packages/univint/src/MacTypes.pas
  32. 1 1
      packages/univint/src/Menus.pas
  33. 4 4
      packages/univint/src/Movies.pas
  34. 3 3
      packages/univint/src/NSL.pas
  35. 1 1
      packages/univint/src/NSLCore.pas
  36. 2 2
      packages/univint/src/Navigation.pas
  37. 1 1
      packages/univint/src/NumberFormatting.pas
  38. 3 3
      packages/univint/src/ObjCRuntime.pas
  39. 11 11
      packages/univint/src/OpenTransport.pas
  40. 7 7
      packages/univint/src/OpenTransportProtocol.pas
  41. 5 5
      packages/univint/src/OpenTransportProviders.pas
  42. 2 2
      packages/univint/src/PLStringFuncs.pas
  43. 1 1
      packages/univint/src/QTStreamingComponents.pas
  44. 1 1
      packages/univint/src/Quickdraw.pas
  45. 2 2
      packages/univint/src/QuickdrawTypes.pas
  46. 8 8
      packages/univint/src/SCSI.pas
  47. 3 3
      packages/univint/src/ScalerStreamTypes.pas
  48. 12 12
      packages/univint/src/Script.pas
  49. 1 1
      packages/univint/src/SpeechSynthesis.pas
  50. 5 5
      packages/univint/src/TextCommon.pas
  51. 2 2
      packages/univint/src/TextEdit.pas
  52. 2 2
      packages/univint/src/TextUtils.pas
  53. 1 1
      packages/univint/src/TranslationExtensions.pas
  54. 2 2
      packages/univint/src/cblas.pas
  55. 3 3
      packages/univint/src/cssmtype.pas
  56. 2 2
      packages/univint/src/fp.pas
  57. 8 8
      packages/univint/src/gliDispatch.pas
  58. 21 21
      packages/univint/src/macgl.pas
  59. 29 29
      packages/univint/src/macglext.pas
  60. 3 3
      packages/univint/src/macglu.pas
  61. 2 2
      packages/univint/src/vDSP.pas

+ 1 - 1
packages/univint/src/AudioCodecs.pas

@@ -624,7 +624,7 @@ const
 						This property can be set on an initialized encoder object without having to uninitialize and re-intialize it
 						This property can be set on an initialized encoder object without having to uninitialize and re-intialize it
 						and allows to adjust the encoder quality level for every packet. This is useful for packets streamed over
 						and allows to adjust the encoder quality level for every packet. This is useful for packets streamed over
 						unreliable IP networks where the encoder needs to adapt immediately to network condition changes.
 						unreliable IP networks where the encoder needs to adapt immediately to network condition changes.
-						Escape property ID's start with a '^' symbol as the first char code. This bypasses the initilization check.
+						Escape property ID's start with a '^' symbol as the first AnsiChar code. This bypasses the initilization check.
     @constant		kAudioCodecPropertyProgramTargetLevel
     @constant		kAudioCodecPropertyProgramTargetLevel
 						A Float32 specifying the program target level in dB FS for decoders.
 						A Float32 specifying the program target level in dB FS for decoders.
 						Supported target levels are in the range of -31.0 to -20.0dB.
 						Supported target levels are in the range of -31.0 to -20.0dB.

+ 8 - 8
packages/univint/src/AudioFile.pas

@@ -991,7 +991,7 @@ function AudioFileWritePackets( inAudioFile: AudioFileID; inUseCache: Boolean; i
 					in Sound Designer II files, and possibly other things in other files.
 					in Sound Designer II files, and possibly other things in other files.
 					For simplicity, referred to below as "chunks".
 					For simplicity, referred to below as "chunks".
     @param      inAudioFile			an AudioFileID.
     @param      inAudioFile			an AudioFileID.
-    @param      inUserDataID		the four char code of the chunk.
+    @param      inUserDataID		the four AnsiChar code of the chunk.
     @param      outNumberItems		on output, if successful, number of chunks of this type in the file.
     @param      outNumberItems		on output, if successful, number of chunks of this type in the file.
     @result							returns noErr if successful.
     @result							returns noErr if successful.
 }
 }
@@ -1002,7 +1002,7 @@ function AudioFileCountUserData( inAudioFile: AudioFileID; inUserDataID: UInt32;
     @function	AudioFileGetUserDataSize
     @function	AudioFileGetUserDataSize
     @abstract   Get the size of user data in a file
     @abstract   Get the size of user data in a file
     @param      inAudioFile			an AudioFileID.
     @param      inAudioFile			an AudioFileID.
-    @param      inUserDataID		the four char code of the chunk.
+    @param      inUserDataID		the four AnsiChar code of the chunk.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @param      outUserDataSize		on output, if successful, the size of the user data chunk.
     @param      outUserDataSize		on output, if successful, the size of the user data chunk.
     @result							returns noErr if successful.
     @result							returns noErr if successful.
@@ -1014,7 +1014,7 @@ function AudioFileGetUserDataSize( inAudioFile: AudioFileID; inUserDataID: UInt3
     @function	AudioFileGetUserData
     @function	AudioFileGetUserData
     @abstract   Get the data of a chunk in a file.
     @abstract   Get the data of a chunk in a file.
     @param      inAudioFile			an AudioFileID.
     @param      inAudioFile			an AudioFileID.
-    @param      inUserDataID		the four char code of the chunk.
+    @param      inUserDataID		the four AnsiChar code of the chunk.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @param      inIndex				an index specifying which chunk if there are more than one.
 	@param		ioUserDataSize		the size of the buffer on input, size of bytes copied to buffer on output 
 	@param		ioUserDataSize		the size of the buffer on input, size of bytes copied to buffer on output 
     @param      outUserData			a pointer to a buffer in which to copy the chunk data.
     @param      outUserData			a pointer to a buffer in which to copy the chunk data.
@@ -1027,7 +1027,7 @@ function AudioFileGetUserData( inAudioFile: AudioFileID; inUserDataID: UInt32; i
     @function	AudioFileSetUserData
     @function	AudioFileSetUserData
     @abstract   Set the data of a chunk in a file.
     @abstract   Set the data of a chunk in a file.
     @param      inAudioFile			an AudioFileID.
     @param      inAudioFile			an AudioFileID.
-    @param      inUserDataID		the four char code of the chunk.
+    @param      inUserDataID		the four AnsiChar code of the chunk.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @param      inIndex				an index specifying which chunk if there are more than one.
 	@param		inUserDataSize		on input the size of the data to copy, on output, size of bytes copied from the buffer  
 	@param		inUserDataSize		on input the size of the data to copy, on output, size of bytes copied from the buffer  
     @param      inUserData			a pointer to a buffer from which to copy the chunk data 
     @param      inUserData			a pointer to a buffer from which to copy the chunk data 
@@ -1042,7 +1042,7 @@ function AudioFileSetUserData( inAudioFile: AudioFileID; inUserDataID: UInt32; i
     @function	AudioFileRemoveUserData
     @function	AudioFileRemoveUserData
     @abstract   Remove a user chunk in a file.
     @abstract   Remove a user chunk in a file.
     @param      inAudioFile			an AudioFileID.
     @param      inAudioFile			an AudioFileID.
-    @param      inUserDataID		the four char code of the chunk.
+    @param      inUserDataID		the four AnsiChar code of the chunk.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @result							returns noErr if successful.
     @result							returns noErr if successful.
 }
 }
@@ -1117,7 +1117,7 @@ function AudioFileRemoveUserData( inAudioFile: AudioFileID; inUserDataID: UInt32
 					kBytePacketTranslationFlag_IsEstimate will be set in the mFlags field.
 					kBytePacketTranslationFlag_IsEstimate will be set in the mFlags field.
 					
 					
     @constant   kAudioFilePropertyChunkIDs 
     @constant   kAudioFilePropertyChunkIDs 
-					returns an array of OSType four char codes for each kind of chunk in the file.
+					returns an array of OSType four AnsiChar codes for each kind of chunk in the file.
     @constant   kAudioFilePropertyInfoDictionary 
     @constant   kAudioFilePropertyInfoDictionary 
 					returns a CFDictionary filled with information about the data contained in the file. 
 					returns a CFDictionary filled with information about the data contained in the file. 
 					See dictionary key constants already defined for info string types. 
 					See dictionary key constants already defined for info string types. 
@@ -1347,9 +1347,9 @@ const
     @discussion This struct is used to specify a desired audio file type and data format ID  so
     @discussion This struct is used to specify a desired audio file type and data format ID  so
 				that a list of stream descriptions of available formats can be obtained.
 				that a list of stream descriptions of available formats can be obtained.
     @field      mFileType
     @field      mFileType
-					a four char code for the file type such as kAudioFileAIFFType, kAudioFileCAFType, etc.
+					a four AnsiChar code for the file type such as kAudioFileAIFFType, kAudioFileCAFType, etc.
     @field      mFormatID
     @field      mFormatID
-					a four char code for the format ID such as kAudioFormatLinearPCM, kAudioFormatMPEG4AAC, etc.
+					a four AnsiChar code for the format ID such as kAudioFormatLinearPCM, kAudioFormatMPEG4AAC, etc.
 }
 }
 type
 type
 	AudioFileTypeAndFormatID = record
 	AudioFileTypeAndFormatID = record

+ 6 - 6
packages/univint/src/AudioFileComponents.pas

@@ -239,7 +239,7 @@ type
 	AudioFileComponentPtr = ^AudioFileComponent;
 	AudioFileComponentPtr = ^AudioFileComponent;
 {!
 {!
     @typedef	AudioFileComponentPropertyID
     @typedef	AudioFileComponentPropertyID
-    @abstract		a four char code for a property ID.
+    @abstract		a four AnsiChar code for a property ID.
 }
 }
 type
 type
 	AudioFileComponentPropertyID = UInt32;
 	AudioFileComponentPropertyID = UInt32;
@@ -473,7 +473,7 @@ function AudioFileComponentSetProperty( inComponent: AudioFileComponent; inPrope
 					in Sound Designer II files, and possibly other things in other files.
 					in Sound Designer II files, and possibly other things in other files.
 					For simplicity, referred to below as "chunks".
 					For simplicity, referred to below as "chunks".
     @param inComponent				an AudioFileComponent
     @param inComponent				an AudioFileComponent
-    @param inUserDataID				the four char code of the chunk.
+    @param inUserDataID				the four AnsiChar code of the chunk.
     @param outNumberItems			on output, if successful, number of chunks of this type in the file.
     @param outNumberItems			on output, if successful, number of chunks of this type in the file.
     @result							returns noErr if successful.
     @result							returns noErr if successful.
 }
 }
@@ -484,7 +484,7 @@ function AudioFileComponentCountUserData( inComponent: AudioFileComponent; inUse
     @function	AudioFileComponentGetUserDataSize
     @function	AudioFileComponentGetUserDataSize
     @abstract   implements AudioFileGetUserDataSize
     @abstract   implements AudioFileGetUserDataSize
     @param inComponent				an AudioFileComponent
     @param inComponent				an AudioFileComponent
-    @param inUserDataID				the four char code of the chunk.
+    @param inUserDataID				the four AnsiChar code of the chunk.
     @param inIndex					an index specifying which chunk if there are more than one.
     @param inIndex					an index specifying which chunk if there are more than one.
     @param outUserDataSize			on output, if successful, the size of the user data chunk.
     @param outUserDataSize			on output, if successful, the size of the user data chunk.
     @result							returns noErr if successful.
     @result							returns noErr if successful.
@@ -496,7 +496,7 @@ function AudioFileComponentGetUserDataSize( inComponent: AudioFileComponent; inU
     @function	AudioFileGetUserData
     @function	AudioFileGetUserData
     @abstract   implements AudioFileGetUserData.
     @abstract   implements AudioFileGetUserData.
     @param		inComponent			an AudioFileComponent
     @param		inComponent			an AudioFileComponent
-    @param      inUserDataID		the four char code of the chunk.
+    @param      inUserDataID		the four AnsiChar code of the chunk.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @param      inIndex				an index specifying which chunk if there are more than one.
 	@param		ioUserDataSize		the size of the buffer on input, size of bytes copied to buffer on output 
 	@param		ioUserDataSize		the size of the buffer on input, size of bytes copied to buffer on output 
     @param      outUserData			a pointer to a buffer in which to copy the chunk data.
     @param      outUserData			a pointer to a buffer in which to copy the chunk data.
@@ -509,7 +509,7 @@ function AudioFileComponentGetUserData( inComponent: AudioFileComponent; inUserD
     @function	AudioFileComponentSetUserData
     @function	AudioFileComponentSetUserData
     @abstract   implements AudioFileSetUserData.
     @abstract   implements AudioFileSetUserData.
     @param		inComponent			an AudioFileComponent
     @param		inComponent			an AudioFileComponent
-    @param      inUserDataID		the four char code of the chunk.
+    @param      inUserDataID		the four AnsiChar code of the chunk.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @param      inIndex				an index specifying which chunk if there are more than one.
 	@param		inUserDataSize		on input the size of the data to copy, on output, size of bytes copied from the buffer  
 	@param		inUserDataSize		on input the size of the data to copy, on output, size of bytes copied from the buffer  
     @param      inUserData			a pointer to a buffer from which to copy the chunk data 
     @param      inUserData			a pointer to a buffer from which to copy the chunk data 
@@ -524,7 +524,7 @@ function AudioFileComponentSetUserData( inComponent: AudioFileComponent; inUserD
     @function	AudioFileComponentRemoveUserData
     @function	AudioFileComponentRemoveUserData
     @abstract   implements AudioFileRemoveUserData.
     @abstract   implements AudioFileRemoveUserData.
     @param		inComponent			an AudioFileComponent
     @param		inComponent			an AudioFileComponent
-    @param      inUserDataID		the four char code of the chunk.
+    @param      inUserDataID		the four AnsiChar code of the chunk.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @param      inIndex				an index specifying which chunk if there are more than one.
     @result							returns noErr if successful.
     @result							returns noErr if successful.
 }
 }

+ 1 - 1
packages/univint/src/AudioFileStream.pas

@@ -370,7 +370,7 @@ const
 					When this value has become one, all properties that can be known about the stream are known.
 					When this value has become one, all properties that can be known about the stream are known.
 					
 					
     @constant   kAudioFileStreamProperty_FileFormat 
     @constant   kAudioFileStreamProperty_FileFormat 
-					An UInt32 four char code that identifies the format of the file
+					An UInt32 four AnsiChar code that identifies the format of the file
     @constant   kAudioFileStreamProperty_DataFormat 
     @constant   kAudioFileStreamProperty_DataFormat 
 					An AudioStreamBasicDescription describing the format of the audio data
 					An AudioStreamBasicDescription describing the format of the audio data
     @constant   kAudioFileStreamProperty_FormatList 
     @constant   kAudioFileStreamProperty_FormatList 

+ 1 - 1
packages/univint/src/AudioFormat.pas

@@ -224,7 +224,7 @@ uses MacTypes,CoreAudioTypes;
 
 
 {!
 {!
     @typedef	AudioFormatPropertyID
     @typedef	AudioFormatPropertyID
-    @abstract   A type for four char codes for property IDs
+    @abstract   A type for four AnsiChar codes for property IDs
 }
 }
 type
 type
 	AudioFormatPropertyID = UInt32;
 	AudioFormatPropertyID = UInt32;

+ 2 - 2
packages/univint/src/AudioHardwareBase.pas

@@ -255,7 +255,7 @@ type
 
 
 {!
 {!
     @typedef        AudioObjectPropertySelector
     @typedef        AudioObjectPropertySelector
-    @abstract       An AudioObjectPropertySelector is a four char code that identifies, along with
+    @abstract       An AudioObjectPropertySelector is a four AnsiChar code that identifies, along with
                     the AudioObjectPropertyScope and AudioObjectPropertyElement, a specific piece of
                     the AudioObjectPropertyScope and AudioObjectPropertyElement, a specific piece of
                     information about an AudioObject.
                     information about an AudioObject.
     @discussion     The property selector specifies the general classification of the property such
     @discussion     The property selector specifies the general classification of the property such
@@ -268,7 +268,7 @@ type
 
 
 {!
 {!
     @typedef        AudioObjectPropertyScope
     @typedef        AudioObjectPropertyScope
-    @abstract       An AudioObjectPropertyScope is a four char code that identifies, along with the
+    @abstract       An AudioObjectPropertyScope is a four AnsiChar code that identifies, along with the
                     AudioObjectPropertySelector and AudioObjectPropertyElement, a specific piece of
                     AudioObjectPropertySelector and AudioObjectPropertyElement, a specific piece of
                     information about an AudioObject.
                     information about an AudioObject.
     @discussion     The scope specifies the section of the object in which to look for the property,
     @discussion     The scope specifies the section of the object in which to look for the property,

+ 1 - 1
packages/univint/src/AudioHardwareDeprecated.pas

@@ -269,7 +269,7 @@ const
 
 
 {!
 {!
     @enum           AudioBooleanControl Subclass IDs
     @enum           AudioBooleanControl Subclass IDs
-    @abstract       The four char codes that identify the various standard subclasses of
+    @abstract       The four AnsiChar codes that identify the various standard subclasses of
                     AudioBooleanControl.
                     AudioBooleanControl.
     @constant       kAudioISubOwnerClassID
     @constant       kAudioISubOwnerClassID
                         An AudioBooleanControl where true means that the AudioDevice that
                         An AudioBooleanControl where true means that the AudioDevice that

+ 2 - 2
packages/univint/src/AudioUnitCarbonViews.pas

@@ -227,9 +227,9 @@ type
 {!
 {!
 	@enum		Carbon view component types and subtypes
 	@enum		Carbon view component types and subtypes
 	@constant	kAudioUnitCarbonViewComponentType
 	@constant	kAudioUnitCarbonViewComponentType
-					The four char-code type of a carbon-based view component
+					The four AnsiChar-code type of a carbon-based view component
 	@constant	kAUCarbonViewSubType_Generic
 	@constant	kAUCarbonViewSubType_Generic
-					The four char-code subtype of a carbon-based view component
+					The four AnsiChar-code subtype of a carbon-based view component
 }
 }
 const
 const
 	kAudioUnitCarbonViewComponentType = FourCharCode('auvw');
 	kAudioUnitCarbonViewComponentType = FourCharCode('auvw');

+ 1 - 1
packages/univint/src/AudioUnitProperties.pas

@@ -1538,7 +1538,7 @@ const
 }
 }
 type
 type
 	AudioUnitParameterInfo = record
 	AudioUnitParameterInfo = record
-		name : packed array [0..51] of char;
+		name : packed array [0..51] of AnsiChar;
 		unitName: CFStringRef {__nullable};
 		unitName: CFStringRef {__nullable};
 		clumpID: UInt32;
 		clumpID: UInt32;
 		cfNameString: CFStringRef {__nullable};
 		cfNameString: CFStringRef {__nullable};

+ 1 - 1
packages/univint/src/AudioUnitUtilities.pas

@@ -641,7 +641,7 @@ function AUParameterValueToLinear( inParameterValue: AudioUnitParameterValue; co
         3       1000-9990       -1
         3       1000-9990       -1
         4       10000-99900     -2</pre>
         4       10000-99900     -2</pre>
 }                              
 }                              
-function AUParameterFormatValue( inParameterValue: Float64; const (*var*) inParameter: AudioUnitParameter; var inTextBuffer: char; inDigits: UInt32 ): CStringPtr; external name '_AUParameterFormatValue';
+function AUParameterFormatValue( inParameterValue: Float64; const (*var*) inParameter: AudioUnitParameter; var inTextBuffer: AnsiChar; inDigits: UInt32 ): CStringPtr; external name '_AUParameterFormatValue';
 (* API_AVAILABLE(macos(10.2), ios(6.0), watchos(2.0), tvos(9.0)) *)
 (* API_AVAILABLE(macos(10.2), ios(6.0), watchos(2.0), tvos(9.0)) *)
 
 
 
 

+ 1 - 1
packages/univint/src/Authorization.pas

@@ -395,7 +395,7 @@ const
 
 
 type
 type
 	AuthorizationExternalForm = record
 	AuthorizationExternalForm = record
-		bytes: packed array[0..(kAuthorizationExternalFormLength)-1] of char;
+		bytes: packed array[0..(kAuthorizationExternalFormLength)-1] of AnsiChar;
 	end;
 	end;
 
 
 
 

+ 8 - 8
packages/univint/src/CFBundle.pas

@@ -312,10 +312,10 @@ function CFBundleCopyResourceURLsOfType( bundle: CFBundleRef; resourceType: CFSt
 
 
 function CFBundleCopyLocalizedString( bundle: CFBundleRef; key: CFStringRef; value: CFStringRef; tableName: CFStringRef ): CFStringRef; external name '_CFBundleCopyLocalizedString';
 function CFBundleCopyLocalizedString( bundle: CFBundleRef; key: CFStringRef; value: CFStringRef; tableName: CFStringRef ): CFStringRef; external name '_CFBundleCopyLocalizedString';
 
 
-function CFCopyLocalizedString( key: CFStringRef; comment: PChar ): CFStringRef; inline;
-function CFCopyLocalizedStringFromTable( key: CFStringRef; tableName: CFStringRef; comment: PChar ): CFStringRef; inline;
-function CFCopyLocalizedStringFromTableInBundle( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; comment: PChar ): CFStringRef; inline;
-function CFCopyLocalizedStringWithDefaultValue( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; value: CFStringRef; comment: PChar ): CFStringRef; inline;
+function CFCopyLocalizedString( key: CFStringRef; comment: PAnsiChar ): CFStringRef; inline;
+function CFCopyLocalizedStringFromTable( key: CFStringRef; tableName: CFStringRef; comment: PAnsiChar ): CFStringRef; inline;
+function CFCopyLocalizedStringFromTableInBundle( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; comment: PAnsiChar ): CFStringRef; inline;
+function CFCopyLocalizedStringWithDefaultValue( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; value: CFStringRef; comment: PAnsiChar ): CFStringRef; inline;
 
 
 { ------------- Resource Handling without a CFBundle instance ------------- }
 { ------------- Resource Handling without a CFBundle instance ------------- }
 { This API is provided to enable developers to use the CFBundle resource }
 { This API is provided to enable developers to use the CFBundle resource }
@@ -484,22 +484,22 @@ implementation
 
 
 {$R-}
 {$R-}
 
 
-function CFCopyLocalizedString( key: CFStringRef; comment: PChar ): CFStringRef; inline;
+function CFCopyLocalizedString( key: CFStringRef; comment: PAnsiChar ): CFStringRef; inline;
 begin
 begin
 	CFCopyLocalizedString := CFBundleCopyLocalizedString( CFBundleGetMainBundle, key, key, nil );
 	CFCopyLocalizedString := CFBundleCopyLocalizedString( CFBundleGetMainBundle, key, key, nil );
 end;
 end;
 
 
-function CFCopyLocalizedStringFromTable( key: CFStringRef; tableName: CFStringRef; comment: PChar ): CFStringRef; inline;
+function CFCopyLocalizedStringFromTable( key: CFStringRef; tableName: CFStringRef; comment: PAnsiChar ): CFStringRef; inline;
 begin
 begin
 	CFCopyLocalizedStringFromTable := CFBundleCopyLocalizedString( CFBundleGetMainBundle, key, key, tableName );
 	CFCopyLocalizedStringFromTable := CFBundleCopyLocalizedString( CFBundleGetMainBundle, key, key, tableName );
 end;
 end;
 
 
-function CFCopyLocalizedStringFromTableInBundle( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; comment: PChar ): CFStringRef; inline;
+function CFCopyLocalizedStringFromTableInBundle( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; comment: PAnsiChar ): CFStringRef; inline;
 begin
 begin
 	CFCopyLocalizedStringFromTableInBundle := CFBundleCopyLocalizedString( bundle, key, key, tableName );
 	CFCopyLocalizedStringFromTableInBundle := CFBundleCopyLocalizedString( bundle, key, key, tableName );
 end;
 end;
 
 
-function CFCopyLocalizedStringWithDefaultValue( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; value: CFStringRef; comment: PChar ): CFStringRef; inline;
+function CFCopyLocalizedStringWithDefaultValue( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; value: CFStringRef; comment: PAnsiChar ): CFStringRef; inline;
 begin
 begin
 	CFCopyLocalizedStringWithDefaultValue := CFBundleCopyLocalizedString( bundle, key, value, tableName );
 	CFCopyLocalizedStringWithDefaultValue := CFBundleCopyLocalizedString( bundle, key, value, tableName );
 end;
 end;

+ 3 - 3
packages/univint/src/CFString.pas

@@ -384,16 +384,16 @@ since it is the default choice with Mac OS X developer tools.
 {
 {
 	CFSTR Must only be called with a constant CString
 	CFSTR Must only be called with a constant CString
 }
 }
-function CFSTR( c: PChar ): CFStringRef; external name '___CFStringMakeConstantString';
+function CFSTR( c: PAnsiChar ): CFStringRef; external name '___CFStringMakeConstantString';
 {
 {
 	CFSTRP Must only be called with a constant Pascal String
 	CFSTRP Must only be called with a constant Pascal String
 }
 }
-function CFSTRP( c: PChar ): CFStringRef; external name '___CFStringMakeConstantString';
+function CFSTRP( c: PAnsiChar ): CFStringRef; external name '___CFStringMakeConstantString';
 
 
 {
 {
 	CFSTRP0 Must only be called with a constant Pascal String terminated with a chr(0)
 	CFSTRP0 Must only be called with a constant Pascal String terminated with a chr(0)
 }
 }
-function CFSTRP0( c: PChar ): CFStringRef; external name '___CFStringMakeConstantString';
+function CFSTRP0( c: PAnsiChar ): CFStringRef; external name '___CFStringMakeConstantString';
 
 
 {** Immutable string creation functions **}
 {** Immutable string creation functions **}
 
 

+ 1 - 1
packages/univint/src/CFStringEncodingExt.pas

@@ -355,7 +355,7 @@ const
     kCFStringEncodingBig5 = $0A03;		{ Big-5 (has variants) }
     kCFStringEncodingBig5 = $0A03;		{ Big-5 (has variants) }
     kCFStringEncodingMacRomanLatin1 = $0A04;	{ Mac OS Roman permuted to align with ISO Latin-1 }
     kCFStringEncodingMacRomanLatin1 = $0A04;	{ Mac OS Roman permuted to align with ISO Latin-1 }
     kCFStringEncodingHZ_GB_2312 = $0A05;	{ HZ (RFC 1842, for Chinese mail & news) }
     kCFStringEncodingHZ_GB_2312 = $0A05;	{ HZ (RFC 1842, for Chinese mail & news) }
-    kCFStringEncodingBig5_HKSCS_1999 = $0A06; { Big-5 with Hong Kong special char set supplement}
+    kCFStringEncodingBig5_HKSCS_1999 = $0A06; { Big-5 with Hong Kong special AnsiChar set supplement}
     kCFStringEncodingVISCII = $0A07;	{ RFC 1456, Vietnamese }
     kCFStringEncodingVISCII = $0A07;	{ RFC 1456, Vietnamese }
     kCFStringEncodingKOI8_U = $0A08;	{ RFC 2319, Ukrainian }
     kCFStringEncodingKOI8_U = $0A08;	{ RFC 2319, Ukrainian }
     kCFStringEncodingBig5_E = $0A09;	{ Taiwan Big-5E standard }
     kCFStringEncodingBig5_E = $0A09;	{ Taiwan Big-5E standard }

+ 1 - 1
packages/univint/src/CSIdentityBase.pas

@@ -270,7 +270,7 @@ const
 	kCSIdentityDuplicateFullNameErr = -6;
 	kCSIdentityDuplicateFullNameErr = -6;
 	
 	
 	{
 	{
-	 * The Posix name is not valid (char set: [a-zA-Z0-9_-] length:
+	 * The Posix name is not valid (AnsiChar set: [a-zA-Z0-9_-] length:
 	 * [1-255])
 	 * [1-255])
 	 }
 	 }
 	kCSIdentityInvalidPosixNameErr = -7;
 	kCSIdentityInvalidPosixNameErr = -7;

+ 5 - 5
packages/univint/src/ColorSyncDeprecated.pas

@@ -674,7 +674,7 @@ type
 		typeDescriptor: OSType;         { 'data' = cmSigDataType}
 		typeDescriptor: OSType;         { 'data' = cmSigDataType}
 		reserved: UInt32;               { fill with 0x00 }
 		reserved: UInt32;               { fill with 0x00 }
 		dataFlag: UInt32;               { 0 = ASCII, 1 = binary }
 		dataFlag: UInt32;               { 0 = ASCII, 1 = binary }
-		data: array [0..0] of char;                { variable size, determined by tag element size }
+		data: array [0..0] of AnsiChar;                { variable size, determined by tag element size }
 	end;
 	end;
 
 
 type
 type
@@ -1048,8 +1048,8 @@ type
 type
 type
 	CMMultiLocalizedUniCodeEntryRecPtr = ^CMMultiLocalizedUniCodeEntryRec;
 	CMMultiLocalizedUniCodeEntryRecPtr = ^CMMultiLocalizedUniCodeEntryRec;
 	CMMultiLocalizedUniCodeEntryRec = record
 	CMMultiLocalizedUniCodeEntryRec = record
-		languageCode: packed array [0..1] of char;        { language code from ISO-639 }
-		regionCode: packed array [0..1] of char;          { region code from ISO-3166 }
+		languageCode: packed array [0..1] of AnsiChar;        { language code from ISO-639 }
+		regionCode: packed array [0..1] of AnsiChar;          { region code from ISO-3166 }
 		textLength: UInt32;             { the length in bytes of the string }
 		textLength: UInt32;             { the length in bytes of the string }
 		textOffset: UInt32;             { the offset from the start of tag in bytes }
 		textOffset: UInt32;             { the offset from the start of tag in bytes }
 	end;
 	end;
@@ -1729,7 +1729,7 @@ type
 		profileHeader: CM2Header;
 		profileHeader: CM2Header;
 		calibrationDate: CMDateTime;
 		calibrationDate: CMDateTime;
 		ASCIIProfileDescriptionLen: UInt32;
 		ASCIIProfileDescriptionLen: UInt32;
-		ASCIIProfileDescription: array [0..0] of char; { variable length }
+		ASCIIProfileDescription: array [0..0] of AnsiChar; { variable length }
 end;
 end;
 {$endc} {not TARGET_CPU_64}
 {$endc} {not TARGET_CPU_64}
 
 
@@ -1930,7 +1930,7 @@ type
 type
 type
 	CMPathLocationPtr = ^CMPathLocation;
 	CMPathLocationPtr = ^CMPathLocation;
 	CMPathLocation = record
 	CMPathLocation = record
-		path: packed array [0..CS_MAX_PATH] of char;
+		path: packed array [0..CS_MAX_PATH] of AnsiChar;
 	end;
 	end;
 
 
 type
 type

+ 1 - 1
packages/univint/src/ConditionalMacros.pas

@@ -280,7 +280,7 @@ interface
     This conditional is deprecated.  It was used to work around a bug in one obscure compiler that did not pack multiple characters in single quotes rationally.
     This conditional is deprecated.  It was used to work around a bug in one obscure compiler that did not pack multiple characters in single quotes rationally.
     It was never intended for endian swapping.
     It was never intended for endian swapping.
 
 
-        FourCharCode('abcd')  - Convert a four-char-code to the correct 32-bit value
+        FourCharCode('abcd')  - Convert a four-AnsiChar-code to the correct 32-bit value
 
 
 
 
     TYPE_*
     TYPE_*

+ 5 - 5
packages/univint/src/CoreAudioTypes.pas

@@ -371,7 +371,7 @@ const
     @field          mSampleRate
     @field          mSampleRate
                         The number of sample frames per second of the data in the stream.
                         The number of sample frames per second of the data in the stream.
     @field          mFormatID
     @field          mFormatID
-                        A four char code indicating the general kind of data in the stream.
+                        A four AnsiChar code indicating the general kind of data in the stream.
     @field          mFormatFlags
     @field          mFormatFlags
                         Flags specific to each format.
                         Flags specific to each format.
     @field          mBytesPerPacket
     @field          mBytesPerPacket
@@ -413,7 +413,7 @@ const
 
 
 {!
 {!
     @enum           Format IDs
     @enum           Format IDs
-    @abstract       The four char code IDs used to identify individual formats of audio data.
+    @abstract       The four AnsiChar code IDs used to identify individual formats of audio data.
     @constant       kAudioFormatLinearPCM
     @constant       kAudioFormatLinearPCM
                         Linear PCM, uses the standard flags.
                         Linear PCM, uses the standard flags.
     @constant       kAudioFormatAC3
     @constant       kAudioFormatAC3
@@ -944,11 +944,11 @@ const
     @struct         AudioClassDescription
     @struct         AudioClassDescription
     @abstract       This structure is used to describe codecs installed on the system.
     @abstract       This structure is used to describe codecs installed on the system.
     @field          mType
     @field          mType
-                        The four char code codec type.
+                        The four AnsiChar code codec type.
     @field          mSubType
     @field          mSubType
-                        The four char code codec subtype.
+                        The four AnsiChar code codec subtype.
     @field          mManufacturer
     @field          mManufacturer
-                        The four char code codec manufacturer.
+                        The four AnsiChar code codec manufacturer.
 }
 }
 type
 type
 	AudioClassDescription = record
 	AudioClassDescription = record

+ 1 - 1
packages/univint/src/DateTimeUtils.pas

@@ -267,7 +267,7 @@ const
 const
 const
 { Date equates }
 { Date equates }
 	smallDateBit = 31;   {Restrict valid date/time to range of Time global}
 	smallDateBit = 31;   {Restrict valid date/time to range of Time global}
-	togChar12HourBit = 30;   {If toggling hour by char, accept hours 1..12 only}
+	togChar12HourBit = 30;   {If toggling hour by AnsiChar, accept hours 1..12 only}
 	togCharZCycleBit = 29;   {Modifier for togChar12HourBit: accept hours 0..11 only}
 	togCharZCycleBit = 29;   {Modifier for togChar12HourBit: accept hours 0..11 only}
 	togDelta12HourBit = 28;   {If toggling hour up/down, restrict to 12-hour range (am/pm)}
 	togDelta12HourBit = 28;   {If toggling hour up/down, restrict to 12-hour range (am/pm)}
 	genCdevRangeBit = 27;   {Restrict date/time to range used by genl CDEV}
 	genCdevRangeBit = 27;   {Restrict date/time to range used by genl CDEV}

+ 4 - 4
packages/univint/src/Debugging.pas

@@ -820,7 +820,7 @@ procedure InstallDebugAssertOutputHandler( handler: DebugAssertOutputHandlerUPP
  *  GetMacOSStatusErrorString()
  *  GetMacOSStatusErrorString()
  *  
  *  
  *  Summary:
  *  Summary:
- *    Returns a const char* string which corresponds to the textual
+ *    Returns a const AnsiChar* string which corresponds to the textual
  *    constant for the given OSStatus code.
  *    constant for the given OSStatus code.
  *  
  *  
  *  Discussion:
  *  Discussion:
@@ -844,7 +844,7 @@ procedure InstallDebugAssertOutputHandler( handler: DebugAssertOutputHandlerUPP
  *      The OSStatus to return a text string for.
  *      The OSStatus to return a text string for.
  *  
  *  
  *  Result:
  *  Result:
- *    A const char* string corresponding to the given OSStatus
+ *    A const AnsiChar* string corresponding to the given OSStatus
  *  
  *  
  *  Availability:
  *  Availability:
  *    Mac OS X:         in version 10.4 and later in CoreServices.framework
  *    Mac OS X:         in version 10.4 and later in CoreServices.framework
@@ -859,7 +859,7 @@ function GetMacOSStatusErrorString( err: OSStatus ): CStringPtr; external name '
  *  GetMacOSStatusCommentString()
  *  GetMacOSStatusCommentString()
  *  
  *  
  *  Summary:
  *  Summary:
- *    Returns a const char* string which corresponds to the descriptive
+ *    Returns a const AnsiChar* string which corresponds to the descriptive
  *    string for the given OSStatus code.
  *    string for the given OSStatus code.
  *  
  *  
  *  Discussion:
  *  Discussion:
@@ -885,7 +885,7 @@ function GetMacOSStatusErrorString( err: OSStatus ): CStringPtr; external name '
  *      The OSStatus to return a text string for.
  *      The OSStatus to return a text string for.
  *  
  *  
  *  Result:
  *  Result:
- *    A const char* string corresponding to the given OSStatus
+ *    A const AnsiChar* string corresponding to the given OSStatus
  *  
  *  
  *  Availability:
  *  Availability:
  *    Mac OS X:         in version 10.4 and later in CoreServices.framework
  *    Mac OS X:         in version 10.4 and later in CoreServices.framework

+ 5 - 5
packages/univint/src/Files.pas

@@ -1999,7 +1999,7 @@ type
 		userNameOffset: SInt16;         { offset to pascal User Name string }
 		userNameOffset: SInt16;         { offset to pascal User Name string }
 		userPasswordOffset: SInt16;     { offset to pascal User Password string }
 		userPasswordOffset: SInt16;     { offset to pascal User Password string }
 		volPasswordOffset: SInt16;      { offset to pascal Volume Password string }
 		volPasswordOffset: SInt16;      { offset to pascal Volume Password string }
-		AFPData: packed array [1..144] of char;           { variable length data may follow }
+		AFPData: packed array [1..144] of AnsiChar;           { variable length data may follow }
 	end;
 	end;
 	AFPVolMountInfoPtr = ^AFPVolMountInfo;
 	AFPVolMountInfoPtr = ^AFPVolMountInfo;
 
 
@@ -2022,7 +2022,7 @@ type
 		extendedFlags: SInt16;          { extended flags word }
 		extendedFlags: SInt16;          { extended flags word }
 		uamNameOffset: SInt16;          { offset to a pascal UAM name string }
 		uamNameOffset: SInt16;          { offset to a pascal UAM name string }
 		alternateAddressOffset: SInt16; { offset to Alternate Addresses in tagged format }
 		alternateAddressOffset: SInt16; { offset to Alternate Addresses in tagged format }
-		AFPData: packed array [1..176] of char;           { variable length data may follow }
+		AFPData: packed array [1..176] of AnsiChar;           { variable length data may follow }
 	end;
 	end;
 	AFPXVolMountInfoPtr = ^AFPXVolMountInfo;
 	AFPXVolMountInfoPtr = ^AFPXVolMountInfo;
 const
 const
@@ -6344,7 +6344,7 @@ function FSMoveObjectToTrashSync( const (*var*) source: FSRef; var target: FSRef
  *      NULL to use the source object name.
  *      NULL to use the source object name.
  *    
  *    
  *    targetPath:
  *    targetPath:
- *      A pointer to a char * to allow returning the path to the newly
+ *      A pointer to a AnsiChar * to allow returning the path to the newly
  *      created object.  The path is allocated using malloc and it is
  *      created object.  The path is allocated using malloc and it is
  *      the caller's responsibility to free.  The pointer will be set
  *      the caller's responsibility to free.  The pointer will be set
  *      to NULL if the copy failed.
  *      to NULL if the copy failed.
@@ -6389,7 +6389,7 @@ function FSPathCopyObjectSync( sourcePath: ConstCStringPtr; destDirPath: ConstCS
  *      Pass NULL to use the source object name.
  *      Pass NULL to use the source object name.
  *    
  *    
  *    targetPath:
  *    targetPath:
- *      A pointer to a char * to allow returning the path to the newly
+ *      A pointer to a AnsiChar * to allow returning the path to the newly
  *      created object.  The path is allocated using malloc and it is
  *      created object.  The path is allocated using malloc and it is
  *      the caller's responsibility to free.  The pointer will be set
  *      the caller's responsibility to free.  The pointer will be set
  *      to NULL if the move failed.
  *      to NULL if the move failed.
@@ -6425,7 +6425,7 @@ function FSPathMoveObjectSync( sourcePath: ConstCStringPtr; destDirPath: ConstCS
  *      The UTF-8 path string of the source object to move.
  *      The UTF-8 path string of the source object to move.
  *    
  *    
  *    targetPath:
  *    targetPath:
- *      A pointer to a char * to allow returning the path to the newly
+ *      A pointer to a AnsiChar * to allow returning the path to the newly
  *      created object.  The path is allocated using malloc and it is
  *      created object.  The path is allocated using malloc and it is
  *      the caller's responsibility to free.  The pointer will be set
  *      the caller's responsibility to free.  The pointer will be set
  *      to NULL if the move failed.
  *      to NULL if the move failed.

+ 2 - 2
packages/univint/src/Fonts.pas

@@ -447,8 +447,8 @@ type
 type
 type
 	KernPairPtr = ^KernPair;
 	KernPairPtr = ^KernPair;
 	KernPair = record
 	KernPair = record
-		kernFirst: char;              {1st character of kerned pair}
-		kernSecond: char;             {2nd character of kerned pair}
+		kernFirst: AnsiChar;              {1st character of kerned pair}
+		kernSecond: AnsiChar;             {2nd character of kerned pair}
 		kernWidth: SInt16;              {kerning in 1pt fixed format}
 		kernWidth: SInt16;              {kerning in 1pt fixed format}
 	end;
 	end;
 type
 type

+ 24 - 24
packages/univint/src/GPCStrings.pas

@@ -242,12 +242,12 @@ type
   procedure SetStr63Length( var s: Str63; len: Integer ); inline;
   procedure SetStr63Length( var s: Str63; len: Integer ); inline;
   procedure SetStr255Length( var s: Str255; len: Integer ); inline;
   procedure SetStr255Length( var s: Str255; len: Integer ); inline;
 
 
-  function CharToStr15( ch: char) : Str15; inline;
-  function CharToStr27( ch: char) : Str27; inline;
-  function CharToStr31( ch: char) : Str31; inline;
-  function CharToStr32( ch: char) : Str32; inline;
-  function CharToStr63( ch: char) : Str63; inline;
-  function CharToStr255( ch: char) : Str255; inline;
+  function CharToStr15( ch: AnsiChar) : Str15; inline;
+  function CharToStr27( ch: AnsiChar) : Str27; inline;
+  function CharToStr31( ch: AnsiChar) : Str31; inline;
+  function CharToStr32( ch: AnsiChar) : Str32; inline;
+  function CharToStr63( ch: AnsiChar) : Str63; inline;
+  function CharToStr255( ch: AnsiChar) : Str255; inline;
   function Str15ToStr15 ( const s: Str15 ) : Str15; inline;
   function Str15ToStr15 ( const s: Str15 ) : Str15; inline;
   function Str15ToStr27 ( const s: Str15 ) : Str27; inline;
   function Str15ToStr27 ( const s: Str15 ) : Str27; inline;
   function Str15ToStr31 ( const s: Str15 ) : Str31; inline;
   function Str15ToStr31 ( const s: Str15 ) : Str31; inline;
@@ -365,12 +365,12 @@ type
 
 
   procedure InsertStr255( const theSource: Str255; var theDest: Str255; theStart: Integer); inline;
   procedure InsertStr255( const theSource: Str255; var theDest: Str255; theStart: Integer); inline;
 
 
-  function PosCharInStr15( theCh: Char; const theStr: Str15) : Integer; inline;
-  function PosCharInStr27( theCh: Char; const theStr: Str27)  : Integer; inline;
-  function PosCharInStr31( theCh: Char; const theStr: Str31)  : Integer; inline;
-  function PosCharInStr32( theCh: Char; const theStr: Str32)  : Integer; inline;
-  function PosCharInStr63( theCh: Char; const theStr: Str63)  : Integer; inline;
-  function PosCharInStr255( theCh: Char; const theStr: Str255)  : Integer; inline;
+  function PosCharInStr15( theCh: AnsiChar; const theStr: Str15) : Integer; inline;
+  function PosCharInStr27( theCh: AnsiChar; const theStr: Str27)  : Integer; inline;
+  function PosCharInStr31( theCh: AnsiChar; const theStr: Str31)  : Integer; inline;
+  function PosCharInStr32( theCh: AnsiChar; const theStr: Str32)  : Integer; inline;
+  function PosCharInStr63( theCh: AnsiChar; const theStr: Str63)  : Integer; inline;
+  function PosCharInStr255( theCh: AnsiChar; const theStr: Str255)  : Integer; inline;
 
 
   function PosInStr255( const theSubStr, theSourceStr: Str255)  : Integer; inline;
   function PosInStr255( const theSubStr, theSourceStr: Str255)  : Integer; inline;
 
 
@@ -441,32 +441,32 @@ implementation
 
 
 
 
 
 
-  function CharToStr15( ch: char): Str15;
+  function CharToStr15( ch: AnsiChar): Str15;
   begin
   begin
     result := ch;
     result := ch;
   end;
   end;
 
 
-  function CharToStr27( ch: char) : Str27;
+  function CharToStr27( ch: AnsiChar) : Str27;
   begin
   begin
     result := ch;
     result := ch;
   end;
   end;
 
 
-  function CharToStr31( ch: char) : Str31;
+  function CharToStr31( ch: AnsiChar) : Str31;
   begin
   begin
     result := ch;
     result := ch;
   end;
   end;
 
 
-  function CharToStr32( ch: char) : Str32;
+  function CharToStr32( ch: AnsiChar) : Str32;
   begin
   begin
     result := ch;
     result := ch;
   end;
   end;
 
 
-  function CharToStr63( ch: char) : Str63;
+  function CharToStr63( ch: AnsiChar) : Str63;
   begin
   begin
     result := ch;
     result := ch;
   end;
   end;
 
 
-  function CharToStr255( ch: char) : Str255;
+  function CharToStr255( ch: AnsiChar) : Str255;
   begin
   begin
     result := ch;
     result := ch;
   end;
   end;
@@ -1024,32 +1024,32 @@ implementation
     insert(theSource,theDest,theStart);
     insert(theSource,theDest,theStart);
   end;
   end;
 
 
-  function PosCharInStr15( theCh: Char; const theStr: Str15)  : Integer;
+  function PosCharInStr15( theCh: AnsiChar; const theStr: Str15)  : Integer;
   begin
   begin
     result := pos(theCh,theStr)
     result := pos(theCh,theStr)
   end;
   end;
 
 
-  function PosCharInStr27( theCh: Char; const theStr: Str27) : Integer;
+  function PosCharInStr27( theCh: AnsiChar; const theStr: Str27) : Integer;
   begin
   begin
     result := pos(theCh,theStr)
     result := pos(theCh,theStr)
   end;
   end;
 
 
-  function PosCharInStr31( theCh: Char; const theStr: Str31)  : Integer;
+  function PosCharInStr31( theCh: AnsiChar; const theStr: Str31)  : Integer;
   begin
   begin
     result := pos(theCh,theStr)
     result := pos(theCh,theStr)
   end;
   end;
 
 
-  function PosCharInStr32( theCh: Char; const theStr: Str32)  : Integer;
+  function PosCharInStr32( theCh: AnsiChar; const theStr: Str32)  : Integer;
   begin
   begin
     result := pos(theCh,theStr)
     result := pos(theCh,theStr)
   end;
   end;
 
 
-  function PosCharInStr63( theCh: Char; const theStr: Str63)  : Integer;
+  function PosCharInStr63( theCh: AnsiChar; const theStr: Str63)  : Integer;
   begin
   begin
     result := pos(theCh,theStr)
     result := pos(theCh,theStr)
   end;
   end;
 
 
-  function PosCharInStr255( theCh: Char; const theStr: Str255)  : Integer;
+  function PosCharInStr255( theCh: AnsiChar; const theStr: Str255)  : Integer;
   begin
   begin
     result := pos(theCh,theStr)
     result := pos(theCh,theStr)
   end;
   end;

+ 1 - 1
packages/univint/src/HITextViews.pas

@@ -862,7 +862,7 @@ const
 
 
 const
 const
 	kControlEditTextSingleLineTag = FourCharCode('sglc'); { data is a Boolean; indicates whether the control should always be single-line}
 	kControlEditTextSingleLineTag = FourCharCode('sglc'); { data is a Boolean; indicates whether the control should always be single-line}
-	kControlEditTextInsertTextBufferTag = FourCharCode('intx'); { data is an array of char; get or set the control's text as WorldScript-encoded text}
+	kControlEditTextInsertTextBufferTag = FourCharCode('intx'); { data is an array of AnsiChar; get or set the control's text as WorldScript-encoded text}
 	kControlEditTextInsertCFStringRefTag = FourCharCode('incf'); { data is a CFStringRef; get or set the control's text as a CFStringRef. Caller should release CFString if getting.}
 	kControlEditTextInsertCFStringRefTag = FourCharCode('incf'); { data is a CFStringRef; get or set the control's text as a CFStringRef. Caller should release CFString if getting.}
 	kControlEditUnicodeTextPostUpdateProcTag = FourCharCode('upup'); { data is a UnicodePostUpdateUPP; get or set the post-update proc}
 	kControlEditUnicodeTextPostUpdateProcTag = FourCharCode('upup'); { data is a UnicodePostUpdateUPP; get or set the post-update proc}
 	kControlEditTextSpellCheckingTag = FourCharCode('spck'); { data is a Boolean; indicates whether the control wants to have spell checking support. Available in Leopard and later.}
 	kControlEditTextSpellCheckingTag = FourCharCode('spck'); { data is a Boolean; indicates whether the control wants to have spell checking support. Available in Leopard and later.}

+ 4 - 4
packages/univint/src/ICAApplication.pas

@@ -452,7 +452,7 @@ const
     @constant kICATypeBoolean
     @constant kICATypeBoolean
         Boolean.
         Boolean.
     @constant kICATypeString
     @constant kICATypeString
-        Char string.
+        AnsiChar string.
     @constant kICATypeData
     @constant kICATypeData
         void *.
         void *.
     @constant kICATypeThumbnail
     @constant kICATypeThumbnail
@@ -1531,7 +1531,7 @@ function ICAObjectSendMessage( var pb: ICAObjectSendMessagePB; completion: ICACo
     @constant kAdjustCreationDate
     @constant kAdjustCreationDate
         Set creation date of the downloaded file same as the creation date for the file as reported by the device.
         Set creation date of the downloaded file same as the creation date for the file as reported by the device.
     @constant kSetFileTypeAndCreator
     @constant kSetFileTypeAndCreator
-        Set 4-char file type and creator code.
+        Set 4-AnsiChar file type and creator code.
     @constant kRotateImage
     @constant kRotateImage
         Rotate the image.
         Rotate the image.
     @constant kDontEmbedColorSyncProfile
     @constant kDontEmbedColorSyncProfile
@@ -1558,9 +1558,9 @@ const
     @field flags 
     @field flags 
         Any combination of flag values defined above. <--
         Any combination of flag values defined above. <--
     @field fileType
     @field fileType
-        Four-char code indicating the type of file. <--
+        Four-AnsiChar code indicating the type of file. <--
     @field fileCreator
     @field fileCreator
-        Four-char code indicating with the creator of the file. <--
+        Four-AnsiChar code indicating with the creator of the file. <--
     @field rotationAngle
     @field rotationAngle
         Rotation angle in steps of 90 degress. <--
         Rotation angle in steps of 90 degress. <--
     @field fileFSRef
     @field fileFSRef

+ 30 - 30
packages/univint/src/IntlResources.pas

@@ -302,29 +302,29 @@ type
 type
 type
 	Intl0RecPtr = ^Intl0Rec;
 	Intl0RecPtr = ^Intl0Rec;
 	Intl0Rec =  record
 	Intl0Rec =  record
-		decimalPt: char;              {decimal point character}
-		thousSep: char;               {thousands separator character}
-		listSep: char;                {list separator character}
-		currSym1: char;               {currency symbol}
-		currSym2: char;
-		currSym3: char;
+		decimalPt: AnsiChar;              {decimal point character}
+		thousSep: AnsiChar;               {thousands separator character}
+		listSep: AnsiChar;                {list separator character}
+		currSym1: AnsiChar;               {currency symbol}
+		currSym2: AnsiChar;
+		currSym3: AnsiChar;
 		currFmt: UInt8;                {currency format flags}
 		currFmt: UInt8;                {currency format flags}
 		dateOrder: UInt8;              {order of short date elements: mdy, dmy, etc.}
 		dateOrder: UInt8;              {order of short date elements: mdy, dmy, etc.}
 		shrtDateFmt: UInt8;            {format flags for each short date element}
 		shrtDateFmt: UInt8;            {format flags for each short date element}
-		dateSep: char;                {date separator character}
+		dateSep: AnsiChar;                {date separator character}
 		timeCycle: UInt8;              {specifies time cycle: 0..23, 1..12, or 0..11}
 		timeCycle: UInt8;              {specifies time cycle: 0..23, 1..12, or 0..11}
 		timeFmt: UInt8;                {format flags for each time element}
 		timeFmt: UInt8;                {format flags for each time element}
-		mornStr: array [1..4] of char;             {trailing string for AM if 12-hour cycle}
-		eveStr: array [1..4] of char;              {trailing string for PM if 12-hour cycle}
-		timeSep: char;                {time separator character}
-		time1Suff: char;              {trailing string for AM if 24-hour cycle}
-		time2Suff: char;
-		time3Suff: char;
-		time4Suff: char;
-		time5Suff: char;              {trailing string for PM if 24-hour cycle}
-		time6Suff: char;
-		time7Suff: char;
-		time8Suff: char;
+		mornStr: array [1..4] of AnsiChar;             {trailing string for AM if 12-hour cycle}
+		eveStr: array [1..4] of AnsiChar;              {trailing string for PM if 12-hour cycle}
+		timeSep: AnsiChar;                {time separator character}
+		time1Suff: AnsiChar;              {trailing string for AM if 24-hour cycle}
+		time2Suff: AnsiChar;
+		time3Suff: AnsiChar;
+		time4Suff: AnsiChar;
+		time5Suff: AnsiChar;              {trailing string for PM if 24-hour cycle}
+		time6Suff: AnsiChar;
+		time7Suff: AnsiChar;
+		time8Suff: AnsiChar;
 		metricSys: UInt8;              {255 if metric, 0 if inches etc.}
 		metricSys: UInt8;              {255 if metric, 0 if inches etc.}
 		intl0Vers: SInt16;              {region code (hi byte) and version (lo byte)}
 		intl0Vers: SInt16;              {region code (hi byte) and version (lo byte)}
 	end;
 	end;
@@ -339,11 +339,11 @@ type
 		lngDateFmt: UInt8;             {order of long date elements}
 		lngDateFmt: UInt8;             {order of long date elements}
 		dayLeading0: UInt8;            {255 for leading 0 in day number}
 		dayLeading0: UInt8;            {255 for leading 0 in day number}
 		abbrLen: UInt8;                {length for abbreviating names}
 		abbrLen: UInt8;                {length for abbreviating names}
-		st0: array [1..4] of char;                 { separator strings for long date format }
-		st1: array [1..4] of char;
-		st2: array [1..4] of char;
-		st3: array [1..4] of char;
-		st4: array [1..4] of char;
+		st0: array [1..4] of AnsiChar;                 { separator strings for long date format }
+		st1: array [1..4] of AnsiChar;
+		st2: array [1..4] of AnsiChar;
+		st3: array [1..4] of AnsiChar;
+		st4: array [1..4] of AnsiChar;
 		intl1Vers: SInt16;              { region code (hi byte) and version (lo byte) }
 		intl1Vers: SInt16;              { region code (hi byte) and version (lo byte) }
 		localRtn: array [0..0] of SInt16;            { now a flag for opt extension }
 		localRtn: array [0..0] of SInt16;            { now a flag for opt extension }
 	end;
 	end;
@@ -383,15 +383,15 @@ type
 	WideChar = packed record
 	WideChar = packed record
 		case SInt16 of
 		case SInt16 of
 		0: (
 		0: (
-			a: packed array [0..1] of char;			{ 0 is the high order character [for PPC] }
+			a: packed array [0..1] of AnsiChar;			{ 0 is the high order character [for PPC] }
 			);
 			);
 		2: (
 		2: (
 {$ifc TARGET_RT_BIG_ENDIAN}
 {$ifc TARGET_RT_BIG_ENDIAN}
-			hi: char;
-			lo: char;
+			hi: AnsiChar;
+			lo: AnsiChar;
 {$elsec}
 {$elsec}
-			lo: char;
-			hi: char;
+			lo: AnsiChar;
+			hi: AnsiChar;
 {$endc}
 {$endc}
 			);
 			);
 		1: (
 		1: (
@@ -412,7 +412,7 @@ type
 		peMinus: WideCharArr;
 		peMinus: WideCharArr;
 		peMinusPlus: WideCharArr;
 		peMinusPlus: WideCharArr;
 		altNumTable: WideCharArr;
 		altNumTable: WideCharArr;
-		reserved: packed array [0..19] of char;
+		reserved: packed array [0..19] of AnsiChar;
 	end;
 	end;
 	NumberPartsPtr = ^NumberParts;
 	NumberPartsPtr = ^NumberParts;
 
 
@@ -522,7 +522,7 @@ type
 		itlbSort: SInt16;               {itl2 id number}
 		itlbSort: SInt16;               {itl2 id number}
 		itlbFlags: SInt16;              {Script flags}
 		itlbFlags: SInt16;              {Script flags}
 		itlbToken: SInt16;              {itl4 id number}
 		itlbToken: SInt16;              {itl4 id number}
-		itlbEncoding: SInt16;           {itl5 ID # (optional; char encoding)}
+		itlbEncoding: SInt16;           {itl5 ID # (optional; AnsiChar encoding)}
 		itlbLang: SInt16;               {current language for script }
 		itlbLang: SInt16;               {current language for script }
 		itlbNumRep: SInt8;             {number representation code}
 		itlbNumRep: SInt8;             {number representation code}
 		itlbDateRep: SInt8;            {date representation code }
 		itlbDateRep: SInt8;            {date representation code }

+ 1 - 1
packages/univint/src/Lists.pas

@@ -237,7 +237,7 @@ type
 type
 type
 	ListBounds = Rect;
 	ListBounds = Rect;
 	ListBoundsPtr = ^ListBounds;
 	ListBoundsPtr = ^ListBounds;
-	DataArray = packed array [0..32000] of char;
+	DataArray = packed array [0..32000] of AnsiChar;
 type
 type
 	DataPtr = ^DataArray;
 	DataPtr = ^DataArray;
 	DataHandle = ^DataPtr;
 	DataHandle = ^DataPtr;

+ 1 - 1
packages/univint/src/MacMemory.pas

@@ -1623,7 +1623,7 @@ procedure HClrRBit( h: Handle ); external name '_HClrRBit';
  *    bits
  *    bits
  *  
  *  
  *  Discussion:
  *  Discussion:
- *    The HGetState function returns a signed byte (char) containing
+ *    The HGetState function returns a signed byte (AnsiChar) containing
  *    the flags of the master pointer for the given handle. You can
  *    the flags of the master pointer for the given handle. You can
  *    save this byte, change the state of any of the flags using the
  *    save this byte, change the state of any of the flags using the
  *    functions described in this section, and then restore their
  *    functions described in this section, and then restore their

+ 4 - 4
packages/univint/src/MacOSAll.pas

@@ -2036,22 +2036,22 @@ end;
 
 
 {$R-}
 {$R-}
 
 
-function CFCopyLocalizedString( key: CFStringRef; comment: PChar ): CFStringRef; inline;
+function CFCopyLocalizedString( key: CFStringRef; comment: PAnsiChar ): CFStringRef; inline;
 begin
 begin
 	CFCopyLocalizedString := CFBundleCopyLocalizedString( CFBundleGetMainBundle, key, key, nil );
 	CFCopyLocalizedString := CFBundleCopyLocalizedString( CFBundleGetMainBundle, key, key, nil );
 end;
 end;
 
 
-function CFCopyLocalizedStringFromTable( key: CFStringRef; tableName: CFStringRef; comment: PChar ): CFStringRef; inline;
+function CFCopyLocalizedStringFromTable( key: CFStringRef; tableName: CFStringRef; comment: PAnsiChar ): CFStringRef; inline;
 begin
 begin
 	CFCopyLocalizedStringFromTable := CFBundleCopyLocalizedString( CFBundleGetMainBundle, key, key, tableName );
 	CFCopyLocalizedStringFromTable := CFBundleCopyLocalizedString( CFBundleGetMainBundle, key, key, tableName );
 end;
 end;
 
 
-function CFCopyLocalizedStringFromTableInBundle( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; comment: PChar ): CFStringRef; inline;
+function CFCopyLocalizedStringFromTableInBundle( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; comment: PAnsiChar ): CFStringRef; inline;
 begin
 begin
 	CFCopyLocalizedStringFromTableInBundle := CFBundleCopyLocalizedString( bundle, key, key, tableName );
 	CFCopyLocalizedStringFromTableInBundle := CFBundleCopyLocalizedString( bundle, key, key, tableName );
 end;
 end;
 
 
-function CFCopyLocalizedStringWithDefaultValue( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; value: CFStringRef; comment: PChar ): CFStringRef; inline;
+function CFCopyLocalizedStringWithDefaultValue( key: CFStringRef; tableName: CFStringRef; bundle: CFBundleRef; value: CFStringRef; comment: PAnsiChar ): CFStringRef; inline;
 begin
 begin
 	CFCopyLocalizedStringWithDefaultValue := CFBundleCopyLocalizedString( bundle, key, value, tableName );
 	CFCopyLocalizedStringWithDefaultValue := CFBundleCopyLocalizedString( bundle, key, value, tableName );
 end;
 end;

+ 1 - 1
packages/univint/src/MacOpenGL.pas

@@ -342,7 +342,7 @@ procedure CGLGetVersion( majorvers: PGLint; minorvers: PGLint ); external name '
 {
 {
 ** Convert an error code to a string
 ** Convert an error code to a string
 }
 }
-function CGLErrorString( error: CGLError ): PChar; external name '_CGLErrorString';
+function CGLErrorString( error: CGLError ): PAnsiChar; external name '_CGLErrorString';
 
 
 {$endc} {TARGET_OS_MAC}
 {$endc} {TARGET_OS_MAC}
 {$ifc not defined MACOSALLINCLUDE or not MACOSALLINCLUDE}
 {$ifc not defined MACOSALLINCLUDE or not MACOSALLINCLUDE}

+ 7 - 7
packages/univint/src/MacTypes.pas

@@ -647,8 +647,8 @@ const
         ConstStringPtr          Pointer to a read-only pascal string
         ConstStringPtr          Pointer to a read-only pascal string
         ConstStrNNNParam        For function parameters only - means string is const
         ConstStrNNNParam        For function parameters only - means string is const
         
         
-        CStringPtr              Pointer to a C string           (in C:  char*)
-        ConstCStringPtr         Pointer to a read-only C string (in C:  const char*)
+        CStringPtr              Pointer to a C string           (in C:  AnsiChar*)
+        ConstCStringPtr         Pointer to a read-only C string (in C:  const AnsiChar*)
         
         
     Note: The length of a pascal string is stored as the first byte.
     Note: The length of a pascal string is stored as the first byte.
           A pascal string does not have a termination byte.
           A pascal string does not have a termination byte.
@@ -694,7 +694,7 @@ type
 	    cross-platform.  For example FSSpec or SFReply previously
 	    cross-platform.  For example FSSpec or SFReply previously
 	    contained a Str63 field.  They now contain a StrFileName
 	    contained a Str63 field.  They now contain a StrFileName
 	    field which is the same when targeting the MacOS but is
 	    field which is the same when targeting the MacOS but is
-	    a 256 char buffer for Win32 and unix, allowing them to
+	    a 256 AnsiChar buffer for Win32 and unix, allowing them to
 	    contain long file names.
 	    contain long file names.
 		}
 		}
 type
 type
@@ -702,7 +702,7 @@ type
 	StringPtr = ^Str255;
 	StringPtr = ^Str255;
 	StringHandle = ^StringPtr;
 	StringHandle = ^StringPtr;
 	ConstStringPtr = StringPtr;
 	ConstStringPtr = StringPtr;
-	CStringPtr = PChar;
+	CStringPtr = PAnsiChar;
 	ConstCStringPtr = CStringPtr;
 	ConstCStringPtr = CStringPtr;
 	CStringPtrPtr = ^CStringPtr;
 	CStringPtrPtr = ^CStringPtr;
 	ConstCStringPtrPtr = ^ConstCStringPtr;
 	ConstCStringPtrPtr = ^ConstCStringPtr;
@@ -736,10 +736,10 @@ type
         Style               Quickdraw font rendering styles
         Style               Quickdraw font rendering styles
         StyleParameter      Style when used as a parameter (historical 68K convention)
         StyleParameter      Style when used as a parameter (historical 68K convention)
         StyleField          Style when used as a field (historical 68K convention)
         StyleField          Style when used as a field (historical 68K convention)
-        CharParameter       Char when used as a parameter (historical 68K convention)
+        CharParameter       AnsiChar when used as a parameter (historical 68K convention)
         
         
     Note:   The original Macintosh toolbox in 68K Pascal defined Style as a SET.  
     Note:   The original Macintosh toolbox in 68K Pascal defined Style as a SET.  
-            Both Style and CHAR occupy 8-bits in packed records or 16-bits when 
+            Both Style and AnsiChar occupy 8-bits in packed records or 16-bits when 
             used as fields in non-packed records or as parameters. 
             used as fields in non-packed records or as parameters. 
         
         
 ********************************************************************************}
 ********************************************************************************}
@@ -786,7 +786,7 @@ type
 	FixedRectPtr = ^FixedRect;
 	FixedRectPtr = ^FixedRect;
 
 
 type
 type
-	CharParameter = Char;
+	CharParameter = AnsiChar;
 const
 const
 	normal = 0;
 	normal = 0;
 	bold = 1;
 	bold = 1;

+ 1 - 1
packages/univint/src/Menus.pas

@@ -3805,7 +3805,7 @@ function GetMenuItemCommandKey( inMenu: MenuRef; inItem: MenuItemIndex; inGetVir
  *  Discussion:
  *  Discussion:
  *    A menu item's keyboard equivalent may be either a character code
  *    A menu item's keyboard equivalent may be either a character code
  *    or a virtual keycode. The character code is always used to draw
  *    or a virtual keycode. The character code is always used to draw
- *    the item's keyboard equivalent in the menu, but either a char
+ *    the item's keyboard equivalent in the menu, but either a AnsiChar
  *    code or a virtual key code may be used for keyboard equivalent
  *    code or a virtual key code may be used for keyboard equivalent
  *    matching by MenuEvent and IsMenuKeyEvent, depending on whether
  *    matching by MenuEvent and IsMenuKeyEvent, depending on whether
  *    the kMenuItemAttrUseVirtualKey item attribute is set. If
  *    the kMenuItemAttrUseVirtualKey item attribute is set. If

+ 4 - 4
packages/univint/src/Movies.pas

@@ -858,8 +858,8 @@ type
 		dataRefIndex: SInt16;
 		dataRefIndex: SInt16;
 
 
 		displayFlags: UInt32;
 		displayFlags: UInt32;
-		horizontalJustification: char;
-		verticalJustification: char;
+		horizontalJustification: AnsiChar;
+		verticalJustification: AnsiChar;
 		backgroundColor: Tx3gRGBAColor;
 		backgroundColor: Tx3gRGBAColor;
 		defaultTextBox: Rect;
 		defaultTextBox: Rect;
 		defaultStyle: Tx3gStyleRecord;
 		defaultStyle: Tx3gStyleRecord;
@@ -1342,7 +1342,7 @@ const
 	kOperandQTVRViewState = 4104; { long viewStateType }
 	kOperandQTVRViewState = 4104; { long viewStateType }
 	kOperandMouseLocalHLoc = 5120; { [TargetAtoms aTrack] }
 	kOperandMouseLocalHLoc = 5120; { [TargetAtoms aTrack] }
 	kOperandMouseLocalVLoc = 5121; { [TargetAtoms aTrack] }
 	kOperandMouseLocalVLoc = 5121; { [TargetAtoms aTrack] }
-	kOperandKeyIsDown = 5122; { [short modKeys, char asciiValue] }
+	kOperandKeyIsDown = 5122; { [short modKeys, AnsiChar asciiValue] }
 	kOperandRandom = 5123; { [short min, short max] }
 	kOperandRandom = 5123; { [short min, short max] }
 	kOperandCanHaveFocus = 5124; { [(TargetAtoms theObject)] }
 	kOperandCanHaveFocus = 5124; { [(TargetAtoms theObject)] }
 	kOperandHasFocus = 5125; { [(TargetAtoms theObject)] }
 	kOperandHasFocus = 5125; { [(TargetAtoms theObject)] }
@@ -15759,7 +15759,7 @@ function QTSampleTableSetProperty( sampleTable: QTSampleTableRef; inPropClass: Q
 * enumerate all items or only items with a particular key.                  *
 * enumerate all items or only items with a particular key.                  *
 *                                                                           *
 *                                                                           *
 * Because a QTMetaDataRef may provide access to different native metadata   *
 * Because a QTMetaDataRef may provide access to different native metadata   *
-* containers with differing key structures (a four-char-code for one, a     *
+* containers with differing key structures (a four-AnsiChar-code for one, a     *
 * string for another, etc.), the key structure is also specified. A         *
 * string for another, etc.), the key structure is also specified. A         *
 * QTMetaDataKeyFormat indicates the key structure in APIs accepting keys.   *
 * QTMetaDataKeyFormat indicates the key structure in APIs accepting keys.   *
 * This is also done because some container formats allow multiple key       *
 * This is also done because some container formats allow multiple key       *

+ 3 - 3
packages/univint/src/NSL.pas

@@ -345,7 +345,7 @@ procedure InvokeNSLEventUPP( var newEvent: EventRecord; userContext: UnivPtr; us
    parameter.  (If left alone, NSLStandardGetURL dialog will strip the service type
    parameter.  (If left alone, NSLStandardGetURL dialog will strip the service type
    portion off the url).
    portion off the url).
 }
 }
-{ char* serviceTypeList }
+{ AnsiChar* serviceTypeList }
 {
 {
    the serviceTypeList parameter is a null terminated string that will 
    the serviceTypeList parameter is a null terminated string that will 
    directly affect the contents of the services popup in the dialog.
    directly affect the contents of the services popup in the dialog.
@@ -379,9 +379,9 @@ procedure InvokeNSLEventUPP( var newEvent: EventRecord; userContext: UnivPtr; us
    servers would be shown with your icon at resource id 129.
    servers would be shown with your icon at resource id 129.
 }
 }
 
 
-{ char** url }
+{ AnsiChar** url }
 {
 {
-   pass in the address of a char* and it will point to the resulting url.  If the user
+   pass in the address of a AnsiChar* and it will point to the resulting url.  If the user
    cancels (the function returns false), the pointer will be set to nil.  If the function
    cancels (the function returns false), the pointer will be set to nil.  If the function
    returns true (user selected a url), then you must call NSLFreeURL on the pointer when
    returns true (user selected a url), then you must call NSLFreeURL on the pointer when
    you are done with it.
    you are done with it.

+ 1 - 1
packages/univint/src/NSLCore.pas

@@ -460,7 +460,7 @@ type
 		serviceListOffset: UInt16;
 		serviceListOffset: UInt16;
 		protocolListOffset: UInt16;
 		protocolListOffset: UInt16;
 		commentStringOffset: UInt16;
 		commentStringOffset: UInt16;
-{  char*                           startOfData; }
+{  AnsiChar*                           startOfData; }
                                               { protocol data is first on the list}
                                               { protocol data is first on the list}
 	end;
 	end;
 	NSLPluginDataPtr = ^NSLPluginData;
 	NSLPluginDataPtr = ^NSLPluginData;

+ 2 - 2
packages/univint/src/Navigation.pas

@@ -318,7 +318,7 @@ type
 			finderDXInfo: DXInfo;
 			finderDXInfo: DXInfo;
 			folderType: OSType;         { package type, For struct version >= 1 }
 			folderType: OSType;         { package type, For struct version >= 1 }
 			folderCreator: OSType;      { package creator, For struct version >= 1 }
 			folderCreator: OSType;      { package creator, For struct version >= 1 }
-			reserved3:			packed array [0..205] of char;
+			reserved3:			packed array [0..205] of AnsiChar;
 		   );
 		   );
 	end;
 	end;
 
 
@@ -836,7 +836,7 @@ type
 		menuCreator: OSType;
 		menuCreator: OSType;
 		menuType: OSType;
 		menuType: OSType;
 		menuItemName: Str255;
 		menuItemName: Str255;
-		reserved: packed array [0..244] of char;
+		reserved: packed array [0..244] of AnsiChar;
 	end;
 	end;
 type
 type
 	NavMenuItemSpecArray = array [0..0] of NavMenuItemSpec;
 	NavMenuItemSpecArray = array [0..0] of NavMenuItemSpec;

+ 1 - 1
packages/univint/src/NumberFormatting.pas

@@ -240,7 +240,7 @@ type
 	NumFormatString = packed record
 	NumFormatString = packed record
 		fLength: UInt8;
 		fLength: UInt8;
 		fVersion: UInt8;
 		fVersion: UInt8;
-		data: packed array [0..253] of char;              { private data }
+		data: packed array [0..253] of AnsiChar;              { private data }
 	end;
 	end;
 type
 type
 	NumFormatStringRec = NumFormatString;
 	NumFormatStringRec = NumFormatString;

+ 3 - 3
packages/univint/src/ObjCRuntime.pas

@@ -375,7 +375,7 @@ type
 	BOOL = boolean; {SInt8}
 	BOOL = boolean; {SInt8}
 {
 {
 	BOOL is explicitly signed so @encode(BOOL) == "c" rather than "C" 
 	BOOL is explicitly signed so @encode(BOOL) == "c" rather than "C" 
-  even if -funsigned-char is used.
+  even if -funsigned-AnsiChar is used.
 }
 }
 
 
 const
 const
@@ -542,7 +542,7 @@ const
 
 
 
 
 #define marg_getRef(margs, offset, type) \
 #define marg_getRef(margs, offset, type) \
-	( (type *)((char *)margs + marg_adjustedOffset(method,offset) ) )
+	( (type *)((AnsiChar *)margs + marg_adjustedOffset(method,offset) ) )
 
 
 #define marg_getValue(margs, offset, type) \
 #define marg_getValue(margs, offset, type) \
 	( *marg_getRef(margs, offset, type) )
 	( *marg_getRef(margs, offset, type) )
@@ -797,7 +797,7 @@ OBJC_EXPORT id	(_zoneAlloc)(Class, unsigned int, void *);
 OBJC_EXPORT id	(_zoneRealloc)(id, unsigned int, void *);
 OBJC_EXPORT id	(_zoneRealloc)(id, unsigned int, void *);
 OBJC_EXPORT id	(_zoneCopy)(id, unsigned int, void *);
 OBJC_EXPORT id	(_zoneCopy)(id, unsigned int, void *);
 
 
-OBJC_EXPORT void	(_error)(id, const char *, va_list);
+OBJC_EXPORT void	(_error)(id, const AnsiChar *, va_list);
 }
 }
 
 
 {$endc} {not TARGET_CPU_64 and TARGET_OS_MAC}
 {$endc} {not TARGET_CPU_64 and TARGET_OS_MAC}

+ 11 - 11
packages/univint/src/OpenTransport.pas

@@ -1173,8 +1173,8 @@ const
 }
 }
 
 
 // #define OPT_NEXTHDR(theBuffer, theBufLen, prevOption) \
 // #define OPT_NEXTHDR(theBuffer, theBufLen, prevOption) \
-//    (((char*)(prevOption) + T_ALIGN((prevOption)->len) < (char*)(theBuffer) + (theBufLen)) ?    \
-//           (TOption*)((char*)(prevOption)+T_ALIGN((prevOption)->len))  \
+//    (((AnsiChar*)(prevOption) + T_ALIGN((prevOption)->len) < (AnsiChar*)(theBuffer) + (theBufLen)) ?    \
+//           (TOption*)((AnsiChar*)(prevOption)+T_ALIGN((prevOption)->len))  \
 //           : (TOption*)NULL)
 //           : (TOption*)NULL)
 
 
 
 
@@ -1457,11 +1457,11 @@ type
 		fCapabilities: UInt32;
 		fCapabilities: UInt32;
 		fNumChildPorts: ItemCount;
 		fNumChildPorts: ItemCount;
 		fChildPorts: OTPortRefPtr;
 		fChildPorts: OTPortRefPtr;
-		fPortName: packed array [0..35] of char;
-		fModuleName: packed array [0..31] of char;
-		fSlotID: packed array [0..7] of char;
-		fResourceInfo: packed array [0..31] of char;
-		fReserved: packed array [0..163] of char;
+		fPortName: packed array [0..35] of AnsiChar;
+		fModuleName: packed array [0..31] of AnsiChar;
+		fSlotID: packed array [0..7] of AnsiChar;
+		fResourceInfo: packed array [0..31] of AnsiChar;
+		fReserved: packed array [0..163] of AnsiChar;
 	end;
 	end;
 {
 {
    Routines for finding, registering and unregistering ports.
    Routines for finding, registering and unregistering ports.
@@ -1837,7 +1837,7 @@ type
 
 
 // #define OTNextLookupBuffer(buf)          \
 // #define OTNextLookupBuffer(buf)          \
 //   ((TLookupBuffer*)                   \
 //   ((TLookupBuffer*)                   \
-//       ((char*)buf + ((OTOffsetOf(TLookupBuffer, fAddressBuffer) + buf->fAddressLength + buf->fNameLength + 3) & ~3)))
+//       ((AnsiChar*)buf + ((OTOffsetOf(TLookupBuffer, fAddressBuffer) + buf->fAddressLength + buf->fNameLength + 3) & ~3)))
 
 
 { ***** Initializing and Shutting Down Open Transport *****}
 { ***** Initializing and Shutting Down Open Transport *****}
 
 
@@ -3433,7 +3433,7 @@ function OTStrLength( str: ConstCStringPtr ): OTByteCount; external name '_OTStr
  *    CarbonLib:        in CarbonLib 1.0 and later
  *    CarbonLib:        in CarbonLib 1.0 and later
  *    Non-Carbon CFM:   in OTUtilityLib 1.0 and later
  *    Non-Carbon CFM:   in OTUtilityLib 1.0 and later
  }
  }
-procedure OTStrCopy( var dest: char; src: ConstCStringPtr ); external name '_OTStrCopy';
+procedure OTStrCopy( var dest: AnsiChar; src: ConstCStringPtr ); external name '_OTStrCopy';
 (* __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_4,__IPHONE_NA,__IPHONE_NA) *)
 (* __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_4,__IPHONE_NA,__IPHONE_NA) *)
 
 
 
 
@@ -3445,7 +3445,7 @@ procedure OTStrCopy( var dest: char; src: ConstCStringPtr ); external name '_OTS
  *    CarbonLib:        in CarbonLib 1.0 and later
  *    CarbonLib:        in CarbonLib 1.0 and later
  *    Non-Carbon CFM:   in OTUtilityLib 1.0 and later
  *    Non-Carbon CFM:   in OTUtilityLib 1.0 and later
  }
  }
-procedure OTStrCat( var dest: char; src: ConstCStringPtr ); external name '_OTStrCat';
+procedure OTStrCat( var dest: AnsiChar; src: ConstCStringPtr ); external name '_OTStrCat';
 (* __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_4,__IPHONE_NA,__IPHONE_NA) *)
 (* __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_4,__IPHONE_NA,__IPHONE_NA) *)
 
 
 
 
@@ -3585,7 +3585,7 @@ type
   structure in which it's embedded.
   structure in which it's embedded.
 }
 }
 // #define OTGetLinkObject(link, struc, field)    \
 // #define OTGetLinkObject(link, struc, field)    \
-//   ((struc*)((char*)(link) - OTOffsetOf(struc, field)))
+//   ((struc*)((AnsiChar*)(link) - OTOffsetOf(struc, field)))
 
 
 { OTLIFO}
 { OTLIFO}
 
 

+ 7 - 7
packages/univint/src/OpenTransportProtocol.pas

@@ -319,7 +319,7 @@ type
 	cred_t = cred;
 	cred_t = cred;
 { Free return structure for esballoc }
 { Free return structure for esballoc }
 type
 type
-	FreeFuncType = procedure( var arg: char );
+	FreeFuncType = procedure( var arg: AnsiChar );
 	free_rtnPtr = ^free_rtn;
 	free_rtnPtr = ^free_rtn;
 	free_rtn = record
 	free_rtn = record
 		free_func: FreeFuncType;              { Routine to call to free buffer }
 		free_func: FreeFuncType;              { Routine to call to free buffer }
@@ -606,7 +606,7 @@ type
 
 
 { structure contained in M_COPYIN/M_COPYOUT messages }
 { structure contained in M_COPYIN/M_COPYOUT messages }
 type
 type
-	caddr_t = ^char;
+	caddr_t = ^AnsiChar;
 	copyreqPtr = ^copyreq;
 	copyreqPtr = ^copyreq;
 	copyreq = record
 	copyreq = record
 		cq_cmd: SInt32;                 { ioctl command (from ioc_cmd) }
 		cq_cmd: SInt32;                 { ioctl command (from ioc_cmd) }
@@ -898,7 +898,7 @@ type
 type
 type
 	str_mlistPtr = ^str_mlist;
 	str_mlistPtr = ^str_mlist;
 	str_mlist = record
 	str_mlist = record
-		l_name: packed array [0..31] of char;
+		l_name: packed array [0..31] of AnsiChar;
 	end;
 	end;
 type
 type
 	str_listPtr = ^str_list;
 	str_listPtr = ^str_list;
@@ -930,7 +930,7 @@ type
 		fd: SIGNEDLONG;                     { new file descriptor (FDCELL) }
 		fd: SIGNEDLONG;                     { new file descriptor (FDCELL) }
 		uid: UInt16;                    { user id of sending stream }
 		uid: UInt16;                    { user id of sending stream }
 		gid: UInt16;
 		gid: UInt16;
-		fill: packed array [0..7] of char;
+		fill: packed array [0..7] of AnsiChar;
 	end;
 	end;
 { structure of ioctl data on I_STR }
 { structure of ioctl data on I_STR }
 type
 type
@@ -969,7 +969,7 @@ type
 	trace_ids = record
 	trace_ids = record
 		ti_mid: SInt16;
 		ti_mid: SInt16;
 		ti_sid: SInt16;
 		ti_sid: SInt16;
-		ti_level: char;
+		ti_level: AnsiChar;
 	end;
 	end;
 const
 const
 	I_TRCLOG = $6201;
 	I_TRCLOG = $6201;
@@ -4543,11 +4543,11 @@ type
 	OTAutopushInfoPtr = ^OTAutopushInfo;
 	OTAutopushInfoPtr = ^OTAutopushInfo;
 	OTAutopushInfo = record
 	OTAutopushInfo = record
 		sap_cmd: UInt32;
 		sap_cmd: UInt32;
-		sap_device_name: packed array [0..31] of char;
+		sap_device_name: packed array [0..31] of AnsiChar;
 		sap_minor: SInt32;
 		sap_minor: SInt32;
 		sap_lastminor: SInt32;
 		sap_lastminor: SInt32;
 		sap_npush: SInt32;
 		sap_npush: SInt32;
-		sap_list: packed array [0..7,0..31] of char;
+		sap_list: packed array [0..7,0..31] of AnsiChar;
 	end;
 	end;
 { Command values for sap_cmd field of the above.}
 { Command values for sap_cmd field of the above.}
 const
 const

+ 5 - 5
packages/univint/src/OpenTransportProviders.pas

@@ -407,7 +407,7 @@ const
 
 
 
 
 type
 type
-	InetDomainName = packed array [0..255] of char;
+	InetDomainName = packed array [0..255] of AnsiChar;
 	InetHostInfoPtr = ^InetHostInfo;
 	InetHostInfoPtr = ^InetHostInfo;
 	InetHostInfo = record
 	InetHostInfo = record
 		name: InetDomainName;
 		name: InetDomainName;
@@ -416,8 +416,8 @@ type
 type
 type
 	InetSysInfoPtr = ^InetSysInfo;
 	InetSysInfoPtr = ^InetSysInfo;
 	InetSysInfo = record
 	InetSysInfo = record
-		cpuType: packed array [0..31] of char;
-		osType: packed array [0..31] of char;
+		cpuType: packed array [0..31] of AnsiChar;
+		osType: packed array [0..31] of AnsiChar;
 	end;
 	end;
 type
 type
 	InetMailExchangePtr = ^InetMailExchange;
 	InetMailExchangePtr = ^InetMailExchange;
@@ -434,7 +434,7 @@ type
 		name: InetDomainName;
 		name: InetDomainName;
 		responseType: UInt16;           { answer, authority, or additional}
 		responseType: UInt16;           { answer, authority, or additional}
 		resourceLen: UInt16;            { actual length of array which follows}
 		resourceLen: UInt16;            { actual length of array which follows}
-		resourceData: packed array [0..3] of char;        { size varies}
+		resourceData: packed array [0..3] of AnsiChar;        { size varies}
 	end;
 	end;
 { DNSAddress}
 { DNSAddress}
 {
 {
@@ -1741,7 +1741,7 @@ type
 	OTISDNAddress = record
 	OTISDNAddress = record
 		fAddressType: OTAddressType;
 		fAddressType: OTAddressType;
 		fPhoneLength: UInt16;
 		fPhoneLength: UInt16;
-		fPhoneNumber: packed array [0..36] of char;
+		fPhoneNumber: packed array [0..36] of AnsiChar;
 	end;
 	end;
 { IOCTL Calls for ISDN}
 { IOCTL Calls for ISDN}
 { ISDN shares the same ioctl space as serial.}
 { ISDN shares the same ioctl space as serial.}

+ 2 - 2
packages/univint/src/PLStringFuncs.pas

@@ -495,7 +495,7 @@ function PLstrncat( str1: StringPtr; const (*var*) append: Str255; num: SInt16 )
  *  
  *  
  *  Discussion:
  *  Discussion:
  *    The PLstrrchr() function locates the first occurrence of ch1
  *    The PLstrrchr() function locates the first occurrence of ch1
- *    (converted to an unsigned char) in the string s.  If ch1 does not
+ *    (converted to an unsigned AnsiChar) in the string s.  If ch1 does not
  *    occur in the string, this returns NULL. This function should be
  *    occur in the string, this returns NULL. This function should be
  *    deprecated since pascal strings are obsolete on MacOSX and
  *    deprecated since pascal strings are obsolete on MacOSX and
  *    CFString should be used instead.
  *    CFString should be used instead.
@@ -535,7 +535,7 @@ function PLstrchr( const (*var*) str1: Str255; ch1: SInt16 ): Ptr; external name
  *  
  *  
  *  Discussion:
  *  Discussion:
  *    The PLstrrchr() function locates the last occurrence of ch1
  *    The PLstrrchr() function locates the last occurrence of ch1
- *    (converted to an unsigned char) in the string s.  If ch1 does not
+ *    (converted to an unsigned AnsiChar) in the string s.  If ch1 does not
  *    occur in the string, this returns NULL. This function should be
  *    occur in the string, this returns NULL. This function should be
  *    deprecated since pascal strings are obsolete on MacOSX and
  *    deprecated since pascal strings are obsolete on MacOSX and
  *    CFString should be used instead.
  *    CFString should be used instead.

+ 1 - 1
packages/univint/src/QTStreamingComponents.pas

@@ -1539,7 +1539,7 @@ const
 	kRTPMPMaxPartialSampleSizeInfo = FourCharCode('mpss'); { UInt32* in bytes }
 	kRTPMPMaxPartialSampleSizeInfo = FourCharCode('mpss'); { UInt32* in bytes }
 	kRTPMPPreferredBufferDelayInfo = FourCharCode('prbd'); { UInt32* in milliseconds }
 	kRTPMPPreferredBufferDelayInfo = FourCharCode('prbd'); { UInt32* in milliseconds }
 	kRTPMPPayloadNameInfo = FourCharCode('name'); { StringPtr }
 	kRTPMPPayloadNameInfo = FourCharCode('name'); { StringPtr }
-	kRTPInfo_FormatString = FourCharCode('fmtp'); { char **, caller allocates ptr, callee disposes }
+	kRTPInfo_FormatString = FourCharCode('fmtp'); { AnsiChar **, caller allocates ptr, callee disposes }
 
 
 {-----------------------------------------
 {-----------------------------------------
     RTP Media Packetizer Characteristics
     RTP Media Packetizer Characteristics

+ 1 - 1
packages/univint/src/Quickdraw.pas

@@ -5962,7 +5962,7 @@ type
  *      enum above)
  *      enum above)
  *  
  *  
  *  Result:
  *  Result:
- *    const char* name, or NULL if 'cursorID' is out of range
+ *    const AnsiChar* name, or NULL if 'cursorID' is out of range
  *  
  *  
  *  Availability:
  *  Availability:
  *    Mac OS X:         in version 10.3 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.4
  *    Mac OS X:         in version 10.3 and later in ApplicationServices.framework [32-bit only] but deprecated in 10.4

+ 2 - 2
packages/univint/src/QuickdrawTypes.pas

@@ -360,7 +360,7 @@ type
 {**************   IMPORTANT NOTE REGARDING Pattern  **************************************
 {**************   IMPORTANT NOTE REGARDING Pattern  **************************************
    Patterns were originally defined as:
    Patterns were originally defined as:
    
    
-        C:          typedef unsigned char Pattern[8];
+        C:          typedef unsigned AnsiChar Pattern[8];
         Pascal:     Pattern = PACKED ARRAY [0..7] OF 0..255;
         Pascal:     Pattern = PACKED ARRAY [0..7] OF 0..255;
         
         
    The old array definition of Pattern would cause 68000 based CPU's to crash in certain circum-
    The old array definition of Pattern would cause 68000 based CPU's to crash in certain circum-
@@ -1628,7 +1628,7 @@ procedure InvokeDeviceLoopDrawingUPP( depth: SInt16; deviceFlags: SInt16; target
 {$ifc NOT OPAQUE_TOOLBOX_STRUCTS OR NOT TARGET_API_MAC_CARBON}
 {$ifc NOT OPAQUE_TOOLBOX_STRUCTS OR NOT TARGET_API_MAC_CARBON}
 type
 type
 	QDGlobals = record
 	QDGlobals = record
-		privates: packed array [0..75] of char;
+		privates: packed array [0..75] of AnsiChar;
 		randSeed: SInt32;               { in Carbon use GetQDGlobalsRandomSeed}
 		randSeed: SInt32;               { in Carbon use GetQDGlobalsRandomSeed}
 		screenBits: BitMap;             { in Carbon use GetQDGlobalsScreenBits}
 		screenBits: BitMap;             { in Carbon use GetQDGlobalsScreenBits}
 		arrow: Cursor;                  { in Carbon use GetQDGlobalsArrow}
 		arrow: Cursor;                  { in Carbon use GetQDGlobalsArrow}

+ 8 - 8
packages/univint/src/SCSI.pas

@@ -631,14 +631,14 @@ type
 		scsiMaxTarget: UInt16;          { <- maximum Target number supported           }
 		scsiMaxTarget: UInt16;          { <- maximum Target number supported           }
 		scsiMaxLUN: UInt16;             { <- maximum Logical Unit number supported    }
 		scsiMaxLUN: UInt16;             { <- maximum Logical Unit number supported    }
 
 
-		scsiSIMVendor: packed array [0..15] of char;			{ <- Vendor ID of SIM (or XPT if bus<FF)        }
-		scsiHBAVendor: packed array [0..15] of char;			{ <- Vendor ID of the HBA                }
-		scsiControllerFamily:	packed array [0..15] of char;			{ <- Family of SCSI Controller           }
-		scsiControllerType: packed array [0..15] of char;			{ <- Specific Model of SCSI Controller used  }
-
-		scsiXPTversion: packed array [0..3] of char;			{ <- version number of XPT              }
-		scsiSIMversion: packed array [0..3] of char;			{ <- version number of SIM              }
-		scsiHBAversion: packed array [0..3] of char;			{ <- version number of HBA              }
+		scsiSIMVendor: packed array [0..15] of AnsiChar;			{ <- Vendor ID of SIM (or XPT if bus<FF)        }
+		scsiHBAVendor: packed array [0..15] of AnsiChar;			{ <- Vendor ID of the HBA                }
+		scsiControllerFamily:	packed array [0..15] of AnsiChar;			{ <- Family of SCSI Controller           }
+		scsiControllerType: packed array [0..15] of AnsiChar;			{ <- Specific Model of SCSI Controller used  }
+
+		scsiXPTversion: packed array [0..3] of AnsiChar;			{ <- version number of XPT              }
+		scsiSIMversion: packed array [0..3] of AnsiChar;			{ <- version number of SIM              }
+		scsiHBAversion: packed array [0..3] of AnsiChar;			{ <- version number of HBA              }
 
 
 		scsiHBAslotType: UInt8;        { <- type of "slot" that this HBA is in       }
 		scsiHBAslotType: UInt8;        { <- type of "slot" that this HBA is in       }
 		scsiHBAslotNumber: UInt8;      { <- slot number of this HBA                  }
 		scsiHBAslotNumber: UInt8;      { <- slot number of this HBA                  }

+ 3 - 3
packages/univint/src/ScalerStreamTypes.pas

@@ -273,14 +273,14 @@ type
 	scalerPrerequisiteItem = record
 	scalerPrerequisiteItem = record
 		enumeration: SInt32;            { Shorthand tag identifying the item }
 		enumeration: SInt32;            { Shorthand tag identifying the item }
 		size: SInt32;                   { Worst case vm in printer item requires. Never > than 16-bit quantity }
 		size: SInt32;                   { Worst case vm in printer item requires. Never > than 16-bit quantity }
-		name: packed array[0..0] of char;          { Name to be used by the client when emitting the item (Pascal string) }
+		name: packed array[0..0] of AnsiChar;          { Name to be used by the client when emitting the item (Pascal string) }
 	end;
 	end;
 
 
 
 
 	scalerStremFontRec = record
 	scalerStremFontRec = record
 		encoding: { const } UInt16Ptr;        { <- Intention is * unsigned short[256] }
 		encoding: { const } UInt16Ptr;        { <- Intention is * unsigned short[256] }
 		glyphBits: SInt32Ptr;          { <->    Bitvector: a bit for each glyph, 1 = desired/supplied }
 		glyphBits: SInt32Ptr;          { <->    Bitvector: a bit for each glyph, 1 = desired/supplied }
-		name: PChar               { <->    The printer font name to use/used (C string) }
+		name: PAnsiChar               { <->    The printer font name to use/used (C string) }
 	end;
 	end;
 
 
 	scalerStreamPrerequisiteQueryRec = record
 	scalerStreamPrerequisiteQueryRec = record
@@ -307,7 +307,7 @@ type
 	scalerStreamPtr = ^scalerStream;
 	scalerStreamPtr = ^scalerStream;
 	scalerStream = record
 	scalerStream = record
 		streamRefCon: { const } UnivPtr;           { <- private reference for client }
 		streamRefCon: { const } UnivPtr;           { <- private reference for client }
-		targetVersion: { const } PChar;          { <- e.g. Postscript printer name (C string) }
+		targetVersion: { const } PAnsiChar;          { <- e.g. Postscript printer name (C string) }
 		types: scalerStreamTypeFlag;                { <->    Data stream formats desired/supplied }
 		types: scalerStreamTypeFlag;                { <->    Data stream formats desired/supplied }
 		action: scalerStreamAction;                 { <-     What action to take }
 		action: scalerStreamAction;                 { <-     What action to take }
 		memorySize: UInt32;             { -> Worst case memory use (vm) in printer or as sfnt }
 		memorySize: UInt32;             { -> Worst case memory use (vm) in printer or as sfnt }

+ 12 - 12
packages/univint/src/Script.pas

@@ -696,18 +696,18 @@ const
 	smKanaHardOK = $0200; {can have dakuten}
 	smKanaHardOK = $0200; {can have dakuten}
 	smKanaSoftOK = $0300; {can have dakuten or han-dakuten}
 	smKanaSoftOK = $0300; {can have dakuten or han-dakuten}
                                         { CharType Ideographic classes for two-byte systems }
                                         { CharType Ideographic classes for two-byte systems }
-	smIdeographicLevel1 = $0000; {level 1 char}
-	smIdeographicLevel2 = $0100; {level 2 char}
-	smIdeographicUser = $0200; {user char}
+	smIdeographicLevel1 = $0000; {level 1 AnsiChar}
+	smIdeographicLevel2 = $0100; {level 2 AnsiChar}
+	smIdeographicUser = $0200; {user AnsiChar}
                                         { old names for above, for backward compatibility }
                                         { old names for above, for backward compatibility }
-	smFISClassLvl1 = $0000; {level 1 char}
-	smFISClassLvl2 = $0100; {level 2 char}
-	smFISClassUser = $0200; {user char}
+	smFISClassLvl1 = $0000; {level 1 AnsiChar}
+	smFISClassLvl2 = $0100; {level 2 AnsiChar}
+	smFISClassUser = $0200; {user AnsiChar}
                                         { CharType Jamo classes for Korean systems }
                                         { CharType Jamo classes for Korean systems }
-	smJamoJaeum = $0000; {simple consonant char}
-	smJamoBogJaeum = $0100; {complex consonant char}
-	smJamoMoeum = $0200; {simple vowel char}
-	smJamoBogMoeum = $0300; {complex vowel char}
+	smJamoJaeum = $0000; {simple consonant AnsiChar}
+	smJamoBogJaeum = $0100; {complex consonant AnsiChar}
+	smJamoMoeum = $0200; {simple vowel AnsiChar}
+	smJamoBogMoeum = $0300; {complex vowel AnsiChar}
 
 
 const
 const
 { CharType glyph orientation for two-byte systems }
 { CharType glyph orientation for two-byte systems }
@@ -804,7 +804,7 @@ const
 	smFondStart = $4000; {start from 16K}
 	smFondStart = $4000; {start from 16K}
 	smFondEnd = $C000; {past end of range at 48K}
 	smFondEnd = $C000; {past end of range at 48K}
                                         { Miscellaneous font equates. }
                                         { Miscellaneous font equates. }
-	smUprHalfCharSet = $80;  {first char code in top half of std char set}
+	smUprHalfCharSet = $80;  {first AnsiChar code in top half of std AnsiChar set}
 
 
 const
 const
 { Character Set Extensions }
 { Character Set Extensions }
@@ -970,7 +970,7 @@ const
 
 
 type
 type
 	TokenResults = SInt8;
 	TokenResults = SInt8;
-	CharByteTable = packed array [0..255] of char;
+	CharByteTable = packed array [0..255] of AnsiChar;
 { "TokenType" was renamed to "ScriptTokenType" because of a name collisions}
 { "TokenType" was renamed to "ScriptTokenType" because of a name collisions}
 type
 type
 	ScriptTokenType = SInt16;
 	ScriptTokenType = SInt16;

+ 1 - 1
packages/univint/src/SpeechSynthesis.pas

@@ -246,7 +246,7 @@ const
 	soStatus = FourCharCode('stat');
 	soStatus = FourCharCode('stat');
 	soErrors = FourCharCode('erro');
 	soErrors = FourCharCode('erro');
 	soInputMode = FourCharCode('inpt');
 	soInputMode = FourCharCode('inpt');
-	soCharacterMode = FourCharCode('char');
+	soCharacterMode = FourCharCode('AnsiChar');
 	soNumberMode = FourCharCode('nmbr');
 	soNumberMode = FourCharCode('nmbr');
 	soRate = FourCharCode('rate');
 	soRate = FourCharCode('rate');
 	soPitchBase = FourCharCode('pbas');
 	soPitchBase = FourCharCode('pbas');

+ 5 - 5
packages/univint/src/TextCommon.pas

@@ -453,7 +453,7 @@ const
 	kTextEncodingBig5 = $0A03; { Big-5 (has variants)}
 	kTextEncodingBig5 = $0A03; { Big-5 (has variants)}
 	kTextEncodingMacRomanLatin1 = $0A04; { Mac OS Roman permuted to align with ISO Latin-1}
 	kTextEncodingMacRomanLatin1 = $0A04; { Mac OS Roman permuted to align with ISO Latin-1}
 	kTextEncodingHZ_GB_2312 = $0A05; { HZ (RFC 1842, for Chinese mail & news)}
 	kTextEncodingHZ_GB_2312 = $0A05; { HZ (RFC 1842, for Chinese mail & news)}
-	kTextEncodingBig5_HKSCS_1999 = $0A06; { Big-5 with Hong Kong special char set supplement}
+	kTextEncodingBig5_HKSCS_1999 = $0A06; { Big-5 with Hong Kong special AnsiChar set supplement}
 	kTextEncodingVISCII = $0A07; { RFC 1456, Vietnamese}
 	kTextEncodingVISCII = $0A07; { RFC 1456, Vietnamese}
 	kTextEncodingKOI8_U = $0A08; { RFC 2319, Ukrainian}
 	kTextEncodingKOI8_U = $0A08; { RFC 2319, Ukrainian}
 	kTextEncodingBig5_E = $0A09; { Taiwan Big-5E standard}
 	kTextEncodingBig5_E = $0A09; { Taiwan Big-5E standard}
@@ -712,7 +712,7 @@ const
                                         { - An array of UTF16Char (UniChar) or UTF32Char is normally understood to use "internal" or}
                                         { - An array of UTF16Char (UniChar) or UTF32Char is normally understood to use "internal" or}
                                         { platform-native byte ordering for kUnicodeUTF16Format and kUnicodeUTF32Format; the array MAY}
                                         { platform-native byte ordering for kUnicodeUTF16Format and kUnicodeUTF32Format; the array MAY}
                                         { begin with byte-order mark (BOM), but the BOM should match the internal ordering.}
                                         { begin with byte-order mark (BOM), but the BOM should match the internal ordering.}
-                                        { - If an array of bytes (such as char *) that can be in various encodings is specified to be}
+                                        { - If an array of bytes (such as AnsiChar *) that can be in various encodings is specified to be}
                                         { in Unicode with kUnicodeUTF16Format or kUnicodeUTF32Format (not explicitly BE or LE), then it}
                                         { in Unicode with kUnicodeUTF16Format or kUnicodeUTF32Format (not explicitly BE or LE), then it}
                                         { is assumed to use "external" byte ordering, which means: If there is a BOM at the beginning}
                                         { is assumed to use "external" byte ordering, which means: If there is a BOM at the beginning}
                                         { of text, the BOM specifies the byte ordering, otherwise big-endian is assumed.}
                                         { of text, the BOM specifies the byte ordering, otherwise big-endian is assumed.}
@@ -868,9 +868,9 @@ const
 const
 const
 	kUnicodeByteOrderMark = $FEFF;
 	kUnicodeByteOrderMark = $FEFF;
 	kUnicodeObjectReplacement = $FFFC; { placeholder for non-text object}
 	kUnicodeObjectReplacement = $FFFC; { placeholder for non-text object}
-	kUnicodeReplacementChar = $FFFD; { Unicode replacement for unconvertable input char}
-	kUnicodeSwappedByteOrderMark = $FFFE; { not a Unicode char; byte-swapped version of FEFF}
-	kUnicodeNotAChar = $FFFF; { not a Unicode char; may be used as a terminator}
+	kUnicodeReplacementChar = $FFFD; { Unicode replacement for unconvertable input AnsiChar}
+	kUnicodeSwappedByteOrderMark = $FFFE; { not a Unicode AnsiChar; byte-swapped version of FEFF}
+	kUnicodeNotAChar = $FFFF; { not a Unicode AnsiChar; may be used as a terminator}
 
 
 
 
 {
 {

+ 2 - 2
packages/univint/src/TextEdit.pas

@@ -290,7 +290,7 @@ type
         Out:
         Out:
             none
             none
 
 
-    typedef pascal Boolean (*EOLHookProcPtr)(char theChar, TEPtr pTE, TEHandle hTE);
+    typedef pascal Boolean (*EOLHookProcPtr)(AnsiChar theChar, TEPtr pTE, TEHandle hTE);
 
 
         In:
         In:
             =>  theChar                 D0.B
             =>  theChar                 D0.B
@@ -532,7 +532,7 @@ const
 
 
 
 
 type
 type
-	Chars = packed array [0..32000] of char;
+	Chars = packed array [0..32000] of AnsiChar;
 	CharsPtr = ^Chars;
 	CharsPtr = ^Chars;
 	CharsHandle = ^CharsPtr;
 	CharsHandle = ^CharsPtr;
 	StyleRunPtr = ^StyleRun;
 	StyleRunPtr = ^StyleRun;

+ 2 - 2
packages/univint/src/TextUtils.pas

@@ -257,7 +257,7 @@ type
 	end;
 	end;
 type
 type
 	BreakTable = record
 	BreakTable = record
-		charTypes: packed array [0..255] of char;
+		charTypes: packed array [0..255] of AnsiChar;
 		tripleLength: SInt16;
 		tripleLength: SInt16;
 		triples: array [0..0] of SInt16;
 		triples: array [0..0] of SInt16;
 	end;
 	end;
@@ -273,7 +273,7 @@ type
 		forwdTableOff: SInt16;
 		forwdTableOff: SInt16;
 		doBackup: SInt16;
 		doBackup: SInt16;
 		length: SInt16;                 { length of NBreakTable }
 		length: SInt16;                 { length of NBreakTable }
-		charTypes: packed array [0..255] of char;
+		charTypes: packed array [0..255] of AnsiChar;
 		tables: array [0..0] of SInt16;
 		tables: array [0..0] of SInt16;
 	end;
 	end;
 	NBreakTablePtr = ^NBreakTable;
 	NBreakTablePtr = ^NBreakTable;

+ 1 - 1
packages/univint/src/TranslationExtensions.pas

@@ -234,7 +234,7 @@ const
 	kTranslatorCanGenerateFilename = 4;
 	kTranslatorCanGenerateFilename = 4;
 
 
 {****************************************************************************************}
 {****************************************************************************************}
-{ better names for 4-char codes}
+{ better names for 4-AnsiChar codes}
 type
 type
 	FileType = OSType;
 	FileType = OSType;
 	FileTypePtr = ^FileType;
 	FileTypePtr = ^FileType;

+ 2 - 2
packages/univint/src/cblas.pas

@@ -290,9 +290,9 @@ const
 type
 type
   CBLAS_INDEX = SInt32;
   CBLAS_INDEX = SInt32;
 
 
-function cblas_errprn( ierr: SInt32; info: SInt32; var form: char; ... ): SInt32; external name '_cblas_errprn';
+function cblas_errprn( ierr: SInt32; info: SInt32; var form: AnsiChar; ... ): SInt32; external name '_cblas_errprn';
 (* __OSX_AVAILABLE_STARTING(__MAC_10_2,__IPHONE_4_0) *)
 (* __OSX_AVAILABLE_STARTING(__MAC_10_2,__IPHONE_4_0) *)
-procedure cblas_xerbla( p: SInt32; var rout: char; var form: char; ... ); external name '_cblas_xerbla';
+procedure cblas_xerbla( p: SInt32; var rout: AnsiChar; var form: AnsiChar; ... ); external name '_cblas_xerbla';
 (* __OSX_AVAILABLE_STARTING(__MAC_10_2,__IPHONE_4_0) *)
 (* __OSX_AVAILABLE_STARTING(__MAC_10_2,__IPHONE_4_0) *)
 
 
 {
 {

+ 3 - 3
packages/univint/src/cssmtype.pas

@@ -294,7 +294,7 @@ const
 const
 const
 	CSSM_MODULE_STRING_SIZE = 64;
 	CSSM_MODULE_STRING_SIZE = 64;
 type
 type
-	CSSM_STRING = array [0..CSSM_MODULE_STRING_SIZE + 4-1] of char;
+	CSSM_STRING = array [0..CSSM_MODULE_STRING_SIZE + 4-1] of AnsiChar;
 
 
 
 
 type
 type
@@ -415,9 +415,9 @@ type
 const
 const
 	CSSM_ADDR_NONE = 0;
 	CSSM_ADDR_NONE = 0;
 	CSSM_ADDR_CUSTOM = 1;
 	CSSM_ADDR_CUSTOM = 1;
-	CSSM_ADDR_URL = 2; { char* }
+	CSSM_ADDR_URL = 2; { AnsiChar* }
 	CSSM_ADDR_SOCKADDR = 3;
 	CSSM_ADDR_SOCKADDR = 3;
-	CSSM_ADDR_NAME = 4; { char* - qualified by access method }
+	CSSM_ADDR_NAME = 4; { AnsiChar* - qualified by access method }
 
 
 type
 type
 	CSSM_NET_ADDRESS_PTR = ^cssm_net_address;
 	CSSM_NET_ADDRESS_PTR = ^cssm_net_address;

+ 2 - 2
packages/univint/src/fp.pas

@@ -922,7 +922,7 @@ function remquo( x: double_t; y: double_t; var quo: SInt32 ): double_t; external
 *                   floating point standard,  which is opposite from the SANE   *
 *                   floating point standard,  which is opposite from the SANE   *
 *                   copysign function.                                          *
 *                   copysign function.                                          *
 *                                                                               *
 *                                                                               *
-*   nan             The call 'nan("n-char-sequence")' returns a quiet NaN       *
+*   nan             The call 'nan("n-AnsiChar-sequence")' returns a quiet NaN       *
 *                   with content indicated through tagp in the selected         *
 *                   with content indicated through tagp in the selected         *
 *                   data type format.                                           *
 *                   data type format.                                           *
 *                                                                               *
 *                                                                               *
@@ -1354,7 +1354,7 @@ function dec2num( const (*var*) d: decimal ): double_t; external name '_dec2num'
  *    CarbonLib:        in CarbonLib 1.0 and later
  *    CarbonLib:        in CarbonLib 1.0 and later
  *    Non-Carbon CFM:   in MathLib 1.0 and later
  *    Non-Carbon CFM:   in MathLib 1.0 and later
  }
  }
-procedure dec2str( const (*var*) f: decform; const (*var*) d: decimal; var s: char ); external name '_dec2str';
+procedure dec2str( const (*var*) f: decform; const (*var*) d: decimal; var s: AnsiChar ); external name '_dec2str';
 (* __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA) *)
 (* __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA) *)
 
 
 
 

+ 8 - 8
packages/univint/src/gliDispatch.pas

@@ -334,7 +334,7 @@ type
 		get_pixel_mapusv : procedure( ctx: GLIContext; map: GLenum; values: PGLushort );
 		get_pixel_mapusv : procedure( ctx: GLIContext; map: GLenum; values: PGLushort );
 		get_pointerv : procedure( ctx: GLIContext; pname: GLenum; params: UnivPtrPtr );
 		get_pointerv : procedure( ctx: GLIContext; pname: GLenum; params: UnivPtrPtr );
 		get_polygon_stipple : procedure( ctx: GLIContext; mask: PGLubyte );
 		get_polygon_stipple : procedure( ctx: GLIContext; mask: PGLubyte );
-		get_string : function( ctx: GLIContext; name: GLenum ): PChar;
+		get_string : function( ctx: GLIContext; name: GLenum ): PAnsiChar;
 		get_tex_envfv : procedure( ctx: GLIContext; target: GLenum; pname: GLenum; params: PGLfloat );
 		get_tex_envfv : procedure( ctx: GLIContext; target: GLenum; pname: GLenum; params: PGLfloat );
 		get_tex_enviv : procedure( ctx: GLIContext; target: GLenum; pname: GLenum; params: PGLint );
 		get_tex_enviv : procedure( ctx: GLIContext; target: GLenum; pname: GLenum; params: PGLint );
 		get_tex_gendv : procedure( ctx: GLIContext; coord: GLenum; pname: GLenum; params: PGLdouble );
 		get_tex_gendv : procedure( ctx: GLIContext; coord: GLenum; pname: GLenum; params: PGLdouble );
@@ -812,7 +812,7 @@ type
 		get_handle_ARB : function( ctx: GLIContext; pname: GLenum ): GLhandleARB;
 		get_handle_ARB : function( ctx: GLIContext; pname: GLenum ): GLhandleARB;
 		detach_object_ARB : procedure( ctx: GLIContext; containerObj: GLhandleARB; attachedObj: GLhandleARB );
 		detach_object_ARB : procedure( ctx: GLIContext; containerObj: GLhandleARB; attachedObj: GLhandleARB );
 		create_shader_object_ARB : function( ctx: GLIContext; shaderType: GLenum ): GLhandleARB;
 		create_shader_object_ARB : function( ctx: GLIContext; shaderType: GLenum ): GLhandleARB;
-		shader_source_ARB : procedure( ctx: GLIContext; shaderObj: GLhandleARB; count: GLsizei; {const} strng: PPChar; const length: PGLint );
+		shader_source_ARB : procedure( ctx: GLIContext; shaderObj: GLhandleARB; count: GLsizei; {const} strng: PPAnsiChar; const length: PGLint );
 		compile_shader_ARB : procedure( ctx: GLIContext; shaderObj: GLhandleARB );
 		compile_shader_ARB : procedure( ctx: GLIContext; shaderObj: GLhandleARB );
 		create_program_object_ARB : function( ctx: GLIContext ): GLhandleARB;
 		create_program_object_ARB : function( ctx: GLIContext ): GLhandleARB;
 		attach_object_ARB : procedure( ctx: GLIContext; containerObj: GLhandleARB; obj: GLhandleARB );
 		attach_object_ARB : procedure( ctx: GLIContext; containerObj: GLhandleARB; obj: GLhandleARB );
@@ -877,8 +877,8 @@ type
 		is_program : function( ctx: GLIContext; program_: GLuint ): GLboolean;
 		is_program : function( ctx: GLIContext; program_: GLuint ): GLboolean;
 		get_shaderiv : procedure( ctx: GLIContext; shader: GLuint; pname: GLenum; params: PGLint );
 		get_shaderiv : procedure( ctx: GLIContext; shader: GLuint; pname: GLenum; params: PGLint );
 		get_programiv : procedure( ctx: GLIContext; program_: GLuint; pname: GLenum; params: PGLint );
 		get_programiv : procedure( ctx: GLIContext; program_: GLuint; pname: GLenum; params: PGLint );
-		get_shader_info_log : procedure( ctx: GLIContext; shader: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PChar );
-		get_program_info_log : procedure( ctx: GLIContext; program_: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PChar );
+		get_shader_info_log : procedure( ctx: GLIContext; shader: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PAnsiChar );
+		get_program_info_log : procedure( ctx: GLIContext; program_: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PAnsiChar );
 	
 	
 		stencil_func_separate : procedure( ctx: GLIContext; face: GLenum; func: GLenum; ref: GLint; mask: GLuint );
 		stencil_func_separate : procedure( ctx: GLIContext; face: GLenum; func: GLenum; ref: GLint; mask: GLuint );
 		stencil_mask_separate : procedure( ctx: GLIContext; face: GLenum; mask: GLuint );
 		stencil_mask_separate : procedure( ctx: GLIContext; face: GLenum; mask: GLuint );
@@ -927,8 +927,8 @@ type
 		bind_buffer_base_EXT : procedure( ctx: GLIContext; target: GLenum; index: GLuint; buffer: GLuint );
 		bind_buffer_base_EXT : procedure( ctx: GLIContext; target: GLenum; index: GLuint; buffer: GLuint );
 		begin_transform_feedback_EXT : procedure( ctx: GLIContext; primitiveMode: GLenum );
 		begin_transform_feedback_EXT : procedure( ctx: GLIContext; primitiveMode: GLenum );
 		end_transform_feedback_EXT : procedure( ctx: GLIContext );
 		end_transform_feedback_EXT : procedure( ctx: GLIContext );
-		transform_feedback_varyings_EXT : procedure( ctx: GLIContext; program_: GLuint; count: GLsizei; {const} varyings: PPChar; bufferMode: GLenum );
-		get_transform_feedback_varying_EXT : procedure( ctx: GLIContext; program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLsizei; typ: PGLenum; name: PChar );
+		transform_feedback_varyings_EXT : procedure( ctx: GLIContext; program_: GLuint; count: GLsizei; {const} varyings: PPAnsiChar; bufferMode: GLenum );
+		get_transform_feedback_varying_EXT : procedure( ctx: GLIContext; program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLsizei; typ: PGLenum; name: PAnsiChar );
 		get_integer_indexedv_EXT : procedure( ctx: GLIContext; param: GLenum; index: GLuint; values: PGLint ); 
 		get_integer_indexedv_EXT : procedure( ctx: GLIContext; param: GLenum; index: GLuint; values: PGLint ); 
 		get_boolean_indexedv_EXT : procedure( ctx: GLIContext; param: GLenum; index: GLuint; values: PGLboolean );
 		get_boolean_indexedv_EXT : procedure( ctx: GLIContext; param: GLenum; index: GLuint; values: PGLboolean );
 	
 	
@@ -978,8 +978,8 @@ type
 		uniform3uiv_EXT : procedure( ctx: GLIContext; location: GLint; count: GLsizei; const value: PGLuint );
 		uniform3uiv_EXT : procedure( ctx: GLIContext; location: GLint; count: GLsizei; const value: PGLuint );
 		uniform4uiv_EXT : procedure( ctx: GLIContext; location: GLint; count: GLsizei; const value: PGLuint );
 		uniform4uiv_EXT : procedure( ctx: GLIContext; location: GLint; count: GLsizei; const value: PGLuint );
 		get_uniformuiv_EXT : procedure( ctx: GLIContext; program_: GLuint; location: GLint; params: PGLuint );
 		get_uniformuiv_EXT : procedure( ctx: GLIContext; program_: GLuint; location: GLint; params: PGLuint );
-		bind_frag_data_location_EXT : procedure( ctx: GLIContext; program_: GLuint; colorNumber: GLuint; const name: PChar );
-		get_frag_data_location_EXT : function( ctx: GLIContext; program_: GLuint; const name: PChar ): GLint;
+		bind_frag_data_location_EXT : procedure( ctx: GLIContext; program_: GLuint; colorNumber: GLuint; const name: PAnsiChar );
+		get_frag_data_location_EXT : function( ctx: GLIContext; program_: GLuint; const name: PAnsiChar ): GLint;
 	
 	
 		{ EXT_draw_buffers2 }
 		{ EXT_draw_buffers2 }
 		color_mask_indexed_EXT : procedure( ctx: GLIContext; index: GLuint; r: GLboolean; g: GLboolean; b: GLboolean; a: GLboolean );
 		color_mask_indexed_EXT : procedure( ctx: GLIContext; index: GLuint; r: GLboolean; g: GLboolean; b: GLboolean; a: GLboolean );

+ 21 - 21
packages/univint/src/macgl.pas

@@ -295,7 +295,7 @@ type
 {$ifc undefined GL_TYPEDEFS_2_0}
 {$ifc undefined GL_TYPEDEFS_2_0}
 {$setc GL_TYPEDEFS_2_0 := TRUE}
 {$setc GL_TYPEDEFS_2_0 := TRUE}
 type
 type
-	GLchar = char;
+	GLchar = AnsiChar;
 {$endc}
 {$endc}
 
 
 
 
@@ -2217,7 +2217,7 @@ type
 	glGetPointervProcPtr = procedure( pname: GLenum; params: UnivPtr );
 	glGetPointervProcPtr = procedure( pname: GLenum; params: UnivPtr );
 	glGetPolygonStippleProcPtr = procedure( mask: PGLubyte );
 	glGetPolygonStippleProcPtr = procedure( mask: PGLubyte );
 	glGetSeparableFilterProcPtr = procedure( target: GLenum; format: GLenum; typ: GLenum; row: UnivPtr; column: UnivPtr; span: UnivPtr );
 	glGetSeparableFilterProcPtr = procedure( target: GLenum; format: GLenum; typ: GLenum; row: UnivPtr; column: UnivPtr; span: UnivPtr );
-	glGetStringProcPtr = function( name: GLenum ): PChar;
+	glGetStringProcPtr = function( name: GLenum ): PAnsiChar;
 	glGetTexEnvfvProcPtr = procedure( target: GLenum; pname: GLenum; params: PGLfloat );
 	glGetTexEnvfvProcPtr = procedure( target: GLenum; pname: GLenum; params: PGLfloat );
 	glGetTexEnvivProcPtr = procedure( target: GLenum; pname: GLenum; params: PGLint );
 	glGetTexEnvivProcPtr = procedure( target: GLenum; pname: GLenum; params: PGLint );
 	glGetTexGendvProcPtr = procedure( coord: GLenum; pname: GLenum; params: PGLdouble );
 	glGetTexGendvProcPtr = procedure( coord: GLenum; pname: GLenum; params: PGLdouble );
@@ -2627,7 +2627,7 @@ type
 	glDeleteShaderProcPtr = procedure( shader: GLuint );
 	glDeleteShaderProcPtr = procedure( shader: GLuint );
 	glDetachShaderProcPtr = procedure( program_: GLuint; shader: GLuint );
 	glDetachShaderProcPtr = procedure( program_: GLuint; shader: GLuint );
 	glCreateShaderProcPtr = function( typ: GLenum ): GLuint;
 	glCreateShaderProcPtr = function( typ: GLenum ): GLuint;
-	glShaderSourceProcPtr = procedure( shader: GLuint; count: GLsizei; {const} strng: PPChar; const length: PGLint );
+	glShaderSourceProcPtr = procedure( shader: GLuint; count: GLsizei; {const} strng: PPAnsiChar; const length: PGLint );
 	glCompileShaderProcPtr = procedure( shader: GLuint );
 	glCompileShaderProcPtr = procedure( shader: GLuint );
 	glCreateProgramProcPtr = function: GLuint;
 	glCreateProgramProcPtr = function: GLuint;
 	glAttachShaderProcPtr = procedure( program_: GLuint; shader: GLuint );
 	glAttachShaderProcPtr = procedure( program_: GLuint; shader: GLuint );
@@ -2659,16 +2659,16 @@ type
 	glGetShaderivProcPtr = procedure( shader: GLuint; pname: GLenum; params: PGLint );
 	glGetShaderivProcPtr = procedure( shader: GLuint; pname: GLenum; params: PGLint );
 	glGetProgramivProcPtr = procedure( program_: GLuint; pname: GLenum; params: PGLint );
 	glGetProgramivProcPtr = procedure( program_: GLuint; pname: GLenum; params: PGLint );
 	glGetAttachedShadersProcPtr = procedure( program_: GLuint; maxCount: GLsizei; count: PGLsizei; shaders: PGLuint );
 	glGetAttachedShadersProcPtr = procedure( program_: GLuint; maxCount: GLsizei; count: PGLsizei; shaders: PGLuint );
-	glGetShaderInfoLogProcPtr = procedure( shader: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PChar );
-	glGetProgramInfoLogProcPtr = procedure( program_: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PChar );
-	glGetUniformLocationProcPtr = function( program_: GLuint; const name: PChar ): GLint;
-	glGetActiveUniformProcPtr = procedure( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PChar );
+	glGetShaderInfoLogProcPtr = procedure( shader: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PAnsiChar );
+	glGetProgramInfoLogProcPtr = procedure( program_: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PAnsiChar );
+	glGetUniformLocationProcPtr = function( program_: GLuint; const name: PAnsiChar ): GLint;
+	glGetActiveUniformProcPtr = procedure( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PAnsiChar );
 	glGetUniformfvProcPtr = procedure( program_: GLuint; location: GLint; params: PGLfloat );
 	glGetUniformfvProcPtr = procedure( program_: GLuint; location: GLint; params: PGLfloat );
 	glGetUniformivProcPtr = procedure( program_: GLuint; location: GLint; params: PGLint );
 	glGetUniformivProcPtr = procedure( program_: GLuint; location: GLint; params: PGLint );
-	glGetShaderSourceProcPtr = procedure( shader: GLuint; bufSize: GLsizei; length: PGLsizei; source: PChar );
-	glBindAttribLocationProcPtr = procedure( program_: GLuint; index: GLuint; const name: PChar );
-	glGetActiveAttribProcPtr = procedure( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PChar );
-	glGetAttribLocationProcPtr = function( program_: GLuint; const name: PChar ): GLint;
+	glGetShaderSourceProcPtr = procedure( shader: GLuint; bufSize: GLsizei; length: PGLsizei; source: PAnsiChar );
+	glBindAttribLocationProcPtr = procedure( program_: GLuint; index: GLuint; const name: PAnsiChar );
+	glGetActiveAttribProcPtr = procedure( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PAnsiChar );
+	glGetAttribLocationProcPtr = function( program_: GLuint; const name: PAnsiChar ): GLint;
 	glStencilFuncSeparateProcPtr = procedure( face: GLenum; func: GLenum; ref: GLint; mask: GLuint );
 	glStencilFuncSeparateProcPtr = procedure( face: GLenum; func: GLenum; ref: GLint; mask: GLuint );
 	glStencilOpSeparateProcPtr = procedure( face: GLenum; fail: GLenum; zfail: GLenum; zpass: GLenum );
 	glStencilOpSeparateProcPtr = procedure( face: GLenum; fail: GLenum; zfail: GLenum; zpass: GLenum );
 	glStencilMaskSeparateProcPtr = procedure( face: GLenum; mask: GLuint );
 	glStencilMaskSeparateProcPtr = procedure( face: GLenum; mask: GLuint );
@@ -2832,7 +2832,7 @@ procedure glGetPixelMapusv( map: GLenum; values: PGLushort ); external name '_gl
 procedure glGetPointerv( pname: GLenum; params: UnivPtrPtr ); external name '_glGetPointerv';
 procedure glGetPointerv( pname: GLenum; params: UnivPtrPtr ); external name '_glGetPointerv';
 procedure glGetPolygonStipple( mask: PGLubyte ); external name '_glGetPolygonStipple';
 procedure glGetPolygonStipple( mask: PGLubyte ); external name '_glGetPolygonStipple';
 procedure glGetSeparableFilter( target: GLenum; format: GLenum; typ: GLenum; row: UnivPtr; column: UnivPtr; span: UnivPtr ); external name '_glGetSeparableFilter';
 procedure glGetSeparableFilter( target: GLenum; format: GLenum; typ: GLenum; row: UnivPtr; column: UnivPtr; span: UnivPtr ); external name '_glGetSeparableFilter';
-function glGetString( name: GLenum ): PChar; external name '_glGetString';
+function glGetString( name: GLenum ): PAnsiChar; external name '_glGetString';
 procedure glGetTexEnvfv( target: GLenum; pname: GLenum; params: PGLfloat ); external name '_glGetTexEnvfv';
 procedure glGetTexEnvfv( target: GLenum; pname: GLenum; params: PGLfloat ); external name '_glGetTexEnvfv';
 procedure glGetTexEnviv( target: GLenum; pname: GLenum; params: PGLint ); external name '_glGetTexEnviv';
 procedure glGetTexEnviv( target: GLenum; pname: GLenum; params: PGLint ); external name '_glGetTexEnviv';
 procedure glGetTexGendv( coord: GLenum; pname: GLenum; params: PGLdouble ); external name '_glGetTexGendv';
 procedure glGetTexGendv( coord: GLenum; pname: GLenum; params: PGLdouble ); external name '_glGetTexGendv';
@@ -3230,7 +3230,7 @@ procedure glDeleteShader( shader: GLuint ); external name '_glDeleteShader';
 procedure glDetachShader( program_: GLuint; shader: GLuint ); external name '_glDetachShader';
 procedure glDetachShader( program_: GLuint; shader: GLuint ); external name '_glDetachShader';
 function glCreateShader( typ: GLenum ): GLuint; external name '_glCreateShader';
 function glCreateShader( typ: GLenum ): GLuint; external name '_glCreateShader';
 
 
-procedure glShaderSource( shader: GLuint; count: GLsizei; {const} strng: PPChar; const length: PGLint ); external name '_glShaderSource';
+procedure glShaderSource( shader: GLuint; count: GLsizei; {const} strng: PPAnsiChar; const length: PGLint ); external name '_glShaderSource';
 
 
 procedure glCompileShader( shader: GLuint ); external name '_glCompileShader';
 procedure glCompileShader( shader: GLuint ); external name '_glCompileShader';
 function glCreateProgram: GLuint; external name '_glCreateProgram';
 function glCreateProgram: GLuint; external name '_glCreateProgram';
@@ -3263,16 +3263,16 @@ function glIsProgram( program_: GLuint ): GLboolean; external name '_glIsProgram
 procedure glGetShaderiv( shader: GLuint; pname: GLenum; params: PGLint ); external name '_glGetShaderiv';
 procedure glGetShaderiv( shader: GLuint; pname: GLenum; params: PGLint ); external name '_glGetShaderiv';
 procedure glGetProgramiv( program_: GLuint; pname: GLenum; params: PGLint ); external name '_glGetProgramiv';
 procedure glGetProgramiv( program_: GLuint; pname: GLenum; params: PGLint ); external name '_glGetProgramiv';
 procedure glGetAttachedShaders( program_: GLuint; maxCount: GLsizei; count: PGLsizei; shaders: PGLuint ); external name '_glGetAttachedShaders';
 procedure glGetAttachedShaders( program_: GLuint; maxCount: GLsizei; count: PGLsizei; shaders: PGLuint ); external name '_glGetAttachedShaders';
-procedure glGetShaderInfoLog( shader: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PChar ); external name '_glGetShaderInfoLog';
-procedure glGetProgramInfoLog( program_: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PChar ); external name '_glGetProgramInfoLog';
-function glGetUniformLocation( program_: GLuint; const name: PChar ): GLint; external name '_glGetUniformLocation';
-procedure glGetActiveUniform( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PChar ); external name '_glGetActiveUniform';
+procedure glGetShaderInfoLog( shader: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PAnsiChar ); external name '_glGetShaderInfoLog';
+procedure glGetProgramInfoLog( program_: GLuint; bufSize: GLsizei; length: PGLsizei; infoLog: PAnsiChar ); external name '_glGetProgramInfoLog';
+function glGetUniformLocation( program_: GLuint; const name: PAnsiChar ): GLint; external name '_glGetUniformLocation';
+procedure glGetActiveUniform( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PAnsiChar ); external name '_glGetActiveUniform';
 procedure glGetUniformfv( program_: GLuint; location: GLint; params: PGLfloat ); external name '_glGetUniformfv';
 procedure glGetUniformfv( program_: GLuint; location: GLint; params: PGLfloat ); external name '_glGetUniformfv';
 procedure glGetUniformiv( program_: GLuint; location: GLint; params: PGLint ); external name '_glGetUniformiv';
 procedure glGetUniformiv( program_: GLuint; location: GLint; params: PGLint ); external name '_glGetUniformiv';
-procedure glGetShaderSource( shader: GLuint; bufSize: GLsizei; length: PGLsizei; source: PChar ); external name '_glGetShaderSource';
-procedure glBindAttribLocation( program_: GLuint; index: GLuint; const name: PChar ); external name '_glBindAttribLocation';
-procedure glGetActiveAttrib( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PChar ); external name '_glGetActiveAttrib';
-function glGetAttribLocation( program_: GLuint; const name: PChar ): GLint; external name '_glGetAttribLocation';
+procedure glGetShaderSource( shader: GLuint; bufSize: GLsizei; length: PGLsizei; source: PAnsiChar ); external name '_glGetShaderSource';
+procedure glBindAttribLocation( program_: GLuint; index: GLuint; const name: PAnsiChar ); external name '_glBindAttribLocation';
+procedure glGetActiveAttrib( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PAnsiChar ); external name '_glGetActiveAttrib';
+function glGetAttribLocation( program_: GLuint; const name: PAnsiChar ): GLint; external name '_glGetAttribLocation';
 procedure glStencilFuncSeparate( face: GLenum; func: GLenum; ref: GLint; mask: GLuint ); external name '_glStencilFuncSeparate';
 procedure glStencilFuncSeparate( face: GLenum; func: GLenum; ref: GLint; mask: GLuint ); external name '_glStencilFuncSeparate';
 procedure glStencilOpSeparate( face: GLenum; fail: GLenum; zfail: GLenum; zpass: GLenum ); external name '_glStencilOpSeparate';
 procedure glStencilOpSeparate( face: GLenum; fail: GLenum; zfail: GLenum; zpass: GLenum ); external name '_glStencilOpSeparate';
 procedure glStencilMaskSeparate( face: GLenum; mask: GLuint ); external name '_glStencilMaskSeparate';
 procedure glStencilMaskSeparate( face: GLenum; mask: GLuint ); external name '_glStencilMaskSeparate';

+ 29 - 29
packages/univint/src/macglext.pas

@@ -400,7 +400,7 @@ uses MacTypes, macgl;
 {***********************************************************}
 {***********************************************************}
 {$ifc not undefined GL_ARB_shader_objects and GL_ARB_shader_objects}
 {$ifc not undefined GL_ARB_shader_objects and GL_ARB_shader_objects}
 type
 type
-	GLcharARB = char;
+	GLcharARB = AnsiChar;
 	PGLcharARB = ^GLcharARB;
 	PGLcharARB = ^GLcharARB;
 	
 	
 	GLhandleARB = UnivPtr;
 	GLhandleARB = UnivPtr;
@@ -3315,8 +3315,8 @@ type
 	glGetProgramLocalParameterfvARBProcPtr = procedure( target: GLenum; index: GLuint; params: PGLfloat );
 	glGetProgramLocalParameterfvARBProcPtr = procedure( target: GLenum; index: GLuint; params: PGLfloat );
 
 
 type
 type
-	glProgramStringARBProcPtr = procedure( target: GLenum; format: GLenum; len: GLsizei; const strng: PChar );
-	glGetProgramStringARBProcPtr = procedure( target: GLenum; pname: GLenum; strng: PChar );
+	glProgramStringARBProcPtr = procedure( target: GLenum; format: GLenum; len: GLsizei; const strng: PAnsiChar );
+	glGetProgramStringARBProcPtr = procedure( target: GLenum; pname: GLenum; strng: PAnsiChar );
 
 
 type
 type
 	glGetProgramivARBProcPtr = procedure( target: GLenum; pname: GLenum; params: PGLint );
 	glGetProgramivARBProcPtr = procedure( target: GLenum; pname: GLenum; params: PGLint );
@@ -3345,8 +3345,8 @@ procedure glProgramLocalParameters4fvEXT( target: GLenum; index: GLuint; count:
 procedure glGetProgramLocalParameterdvARB( target: GLenum; index: GLuint; params: PGLdouble ); external name '_glGetProgramLocalParameterdvARB';
 procedure glGetProgramLocalParameterdvARB( target: GLenum; index: GLuint; params: PGLdouble ); external name '_glGetProgramLocalParameterdvARB';
 procedure glGetProgramLocalParameterfvARB( target: GLenum; index: GLuint; params: PGLfloat ); external name '_glGetProgramLocalParameterfvARB';
 procedure glGetProgramLocalParameterfvARB( target: GLenum; index: GLuint; params: PGLfloat ); external name '_glGetProgramLocalParameterfvARB';
 
 
-procedure glProgramStringARB( target: GLenum; format: GLenum; len: GLsizei; const strng: PChar ); external name '_glProgramStringARB';
-procedure glGetProgramStringARB( target: GLenum; pname: GLenum; strng : PChar ); external name '_glGetProgramStringARB';
+procedure glProgramStringARB( target: GLenum; format: GLenum; len: GLsizei; const strng: PAnsiChar ); external name '_glProgramStringARB';
+procedure glGetProgramStringARB( target: GLenum; pname: GLenum; strng : PAnsiChar ); external name '_glGetProgramStringARB';
 
 
 procedure glGetProgramivARB( target: GLenum; pname: GLenum; params: PGLint ); external name '_glGetProgramivARB';
 procedure glGetProgramivARB( target: GLenum; pname: GLenum; params: PGLint ); external name '_glGetProgramivARB';
 {$endc} { GL_GLEXT_FUNCTION_POINTERS }
 {$endc} { GL_GLEXT_FUNCTION_POINTERS }
@@ -3467,7 +3467,7 @@ type
 {GPC-ONLY-START}	
 {GPC-ONLY-START}	
 	glShaderSourceARBProcPtr = procedure( shaderObj: GLhandleARB; count: GLsizei; {const} strng: CStringPtrPtr; const length: PGLint );
 	glShaderSourceARBProcPtr = procedure( shaderObj: GLhandleARB; count: GLsizei; {const} strng: CStringPtrPtr; const length: PGLint );
 {GPC-ONLY-FINISH}
 {GPC-ONLY-FINISH}
-	glShaderSourceARBProcPtr = procedure( shaderObj: GLhandleARB; count: GLsizei; {const} strng: PPChar; const length: PGLint );
+	glShaderSourceARBProcPtr = procedure( shaderObj: GLhandleARB; count: GLsizei; {const} strng: PPAnsiChar; const length: PGLint );
 
 
 	glCompileShaderARBProcPtr = procedure( shaderObj: GLhandleARB );
 	glCompileShaderARBProcPtr = procedure( shaderObj: GLhandleARB );
 	glCreateProgramObjectARBProcPtr = function: GLhandleARB;
 	glCreateProgramObjectARBProcPtr = function: GLhandleARB;
@@ -3496,20 +3496,20 @@ type
 	glUniformMatrix4fvARBProcPtr = procedure( location: GLint; count: GLsizei; transpose: GLboolean; const value: PGLfloat );
 	glUniformMatrix4fvARBProcPtr = procedure( location: GLint; count: GLsizei; transpose: GLboolean; const value: PGLfloat );
 	glGetObjectParameterfvARBProcPtr = procedure( obj: GLhandleARB; pname: GLenum; params: PGLfloat );
 	glGetObjectParameterfvARBProcPtr = procedure( obj: GLhandleARB; pname: GLenum; params: PGLfloat );
 	glGetObjectParameterivARBProcPtr = procedure( obj: GLhandleARB; pname: GLenum; params: PGLint );
 	glGetObjectParameterivARBProcPtr = procedure( obj: GLhandleARB; pname: GLenum; params: PGLint );
-	glGetInfoLogARBProcPtr = procedure( obj: GLhandleARB; maxLength: GLsizei; length: PGLsizei; infoLog: PChar );
+	glGetInfoLogARBProcPtr = procedure( obj: GLhandleARB; maxLength: GLsizei; length: PGLsizei; infoLog: PAnsiChar );
 	glGetAttachedObjectsARBProcPtr = procedure( containerObj: GLhandleARB; maxCount: GLsizei; count: PGLsizei; var obj: GLhandleARB );
 	glGetAttachedObjectsARBProcPtr = procedure( containerObj: GLhandleARB; maxCount: GLsizei; count: PGLsizei; var obj: GLhandleARB );
-	glGetUniformLocationARBProcPtr = function( programObj: GLhandleARB; const name: PChar ): GLint;
-	glGetActiveUniformARBProcPtr = procedure( programObj: GLhandleARB; index: GLuint; maxLength: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PChar );
+	glGetUniformLocationARBProcPtr = function( programObj: GLhandleARB; const name: PAnsiChar ): GLint;
+	glGetActiveUniformARBProcPtr = procedure( programObj: GLhandleARB; index: GLuint; maxLength: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PAnsiChar );
 	glGetUniformfvARBProcPtr = procedure( programObj: GLhandleARB; location: GLint; params: PGLfloat );
 	glGetUniformfvARBProcPtr = procedure( programObj: GLhandleARB; location: GLint; params: PGLfloat );
 	glGetUniformivARBProcPtr = procedure( programObj: GLhandleARB; location: GLint; params: PGLint );
 	glGetUniformivARBProcPtr = procedure( programObj: GLhandleARB; location: GLint; params: PGLint );
-	glGetShaderSourceARBProcPtr = procedure( obj: GLhandleARB; maxLength: GLsizei; length: PGLsizei; source: PChar );
+	glGetShaderSourceARBProcPtr = procedure( obj: GLhandleARB; maxLength: GLsizei; length: PGLsizei; source: PAnsiChar );
 {$elsec}
 {$elsec}
 procedure glDeleteObjectARB( obj: GLhandleARB ); external name '_glDeleteObjectARB';
 procedure glDeleteObjectARB( obj: GLhandleARB ); external name '_glDeleteObjectARB';
 function glGetHandleARB( pname: GLenum ): GLhandleARB; external name '_glGetHandleARB';
 function glGetHandleARB( pname: GLenum ): GLhandleARB; external name '_glGetHandleARB';
 procedure glDetachObjectARB( containerObj: GLhandleARB; attachedObj: GLhandleARB ); external name '_glDetachObjectARB';
 procedure glDetachObjectARB( containerObj: GLhandleARB; attachedObj: GLhandleARB ); external name '_glDetachObjectARB';
 function glCreateShaderObjectARB( shaderType: GLenum ): GLhandleARB; external name '_glCreateShaderObjectARB';
 function glCreateShaderObjectARB( shaderType: GLenum ): GLhandleARB; external name '_glCreateShaderObjectARB';
 
 
-procedure glShaderSourceARB( shaderObj: GLhandleARB; count: GLsizei; {const} strng: PPChar; const length: PGLint ); external name '_glShaderSourceARB';
+procedure glShaderSourceARB( shaderObj: GLhandleARB; count: GLsizei; {const} strng: PPAnsiChar; const length: PGLint ); external name '_glShaderSourceARB';
 
 
 procedure glCompileShaderARB( shaderObj: GLhandleARB ); external name '_glCompileShaderARB';
 procedure glCompileShaderARB( shaderObj: GLhandleARB ); external name '_glCompileShaderARB';
 function glCreateProgramObjectARB: GLhandleARB; external name '_glCreateProgramObjectARB';
 function glCreateProgramObjectARB: GLhandleARB; external name '_glCreateProgramObjectARB';
@@ -3538,26 +3538,26 @@ procedure glUniformMatrix3fvARB( location: GLint; count: GLsizei; transpose: GLb
 procedure glUniformMatrix4fvARB( location: GLint; count: GLsizei; transpose: GLboolean; const value: PGLfloat ); external name '_glUniformMatrix4fvARB';
 procedure glUniformMatrix4fvARB( location: GLint; count: GLsizei; transpose: GLboolean; const value: PGLfloat ); external name '_glUniformMatrix4fvARB';
 procedure glGetObjectParameterfvARB( obj: GLhandleARB; pname: GLenum; params: PGLfloat ); external name '_glGetObjectParameterfvARB';
 procedure glGetObjectParameterfvARB( obj: GLhandleARB; pname: GLenum; params: PGLfloat ); external name '_glGetObjectParameterfvARB';
 procedure glGetObjectParameterivARB( obj: GLhandleARB; pname: GLenum; params: PGLint ); external name '_glGetObjectParameterivARB';
 procedure glGetObjectParameterivARB( obj: GLhandleARB; pname: GLenum; params: PGLint ); external name '_glGetObjectParameterivARB';
-procedure glGetInfoLogARB( obj: GLhandleARB; maxLength: GLsizei; length: PGLsizei; infoLog: PChar ); external name '_glGetInfoLogARB';
+procedure glGetInfoLogARB( obj: GLhandleARB; maxLength: GLsizei; length: PGLsizei; infoLog: PAnsiChar ); external name '_glGetInfoLogARB';
 procedure glGetAttachedObjectsARB( containerObj: GLhandleARB; maxCount: GLsizei; count: PGLsizei; var obj: GLhandleARB ); external name '_glGetAttachedObjectsARB';
 procedure glGetAttachedObjectsARB( containerObj: GLhandleARB; maxCount: GLsizei; count: PGLsizei; var obj: GLhandleARB ); external name '_glGetAttachedObjectsARB';
-function glGetUniformLocationARB( programObj: GLhandleARB; const name: PChar ): GLint; external name '_glGetUniformLocationARB';
-procedure glGetActiveUniformARB( programObj: GLhandleARB; index: GLuint; maxLength: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PChar ); external name '_glGetActiveUniformARB';
+function glGetUniformLocationARB( programObj: GLhandleARB; const name: PAnsiChar ): GLint; external name '_glGetUniformLocationARB';
+procedure glGetActiveUniformARB( programObj: GLhandleARB; index: GLuint; maxLength: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PAnsiChar ); external name '_glGetActiveUniformARB';
 procedure glGetUniformfvARB( programObj: GLhandleARB; location: GLint; params: PGLfloat ); external name '_glGetUniformfvARB';
 procedure glGetUniformfvARB( programObj: GLhandleARB; location: GLint; params: PGLfloat ); external name '_glGetUniformfvARB';
 procedure glGetUniformivARB( programObj: GLhandleARB; location: GLint; params: PGLint ); external name '_glGetUniformivARB';
 procedure glGetUniformivARB( programObj: GLhandleARB; location: GLint; params: PGLint ); external name '_glGetUniformivARB';
-procedure glGetShaderSourceARB( obj: GLhandleARB; maxLength: GLsizei; length: PGLsizei; source: PChar ); external name '_glGetShaderSourceARB';
+procedure glGetShaderSourceARB( obj: GLhandleARB; maxLength: GLsizei; length: PGLsizei; source: PAnsiChar ); external name '_glGetShaderSourceARB';
 {$endc} { GL_GLEXT_FUNCTION_POINTERS }
 {$endc} { GL_GLEXT_FUNCTION_POINTERS }
 {$endc}
 {$endc}
 
 
 {$ifc not undefined GL_ARB_vertex_shader and GL_ARB_vertex_shader}
 {$ifc not undefined GL_ARB_vertex_shader and GL_ARB_vertex_shader}
 {$ifc not undefined GL_GLEXT_FUNCTION_POINTERS and GL_GLEXT_FUNCTION_POINTERS}
 {$ifc not undefined GL_GLEXT_FUNCTION_POINTERS and GL_GLEXT_FUNCTION_POINTERS}
 type
 type
-	glBindAttribLocationARBProcPtr = procedure( programObj: GLhandleARB; index: GLuint; const name: PChar );
-	glGetActiveAttribARBProcPtr = procedure( programObj: GLhandleARB; index: GLuint; maxLength: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PChar );
-	glGetAttribLocationARBProcPtr = function( programObj: GLhandleARB; const name: PChar ): GLint;
+	glBindAttribLocationARBProcPtr = procedure( programObj: GLhandleARB; index: GLuint; const name: PAnsiChar );
+	glGetActiveAttribARBProcPtr = procedure( programObj: GLhandleARB; index: GLuint; maxLength: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PAnsiChar );
+	glGetAttribLocationARBProcPtr = function( programObj: GLhandleARB; const name: PAnsiChar ): GLint;
 {$elsec}
 {$elsec}
-procedure glBindAttribLocationARB( programObj: GLhandleARB; index: GLuint; const name: PChar ); external name '_glBindAttribLocationARB';
-procedure glGetActiveAttribARB( programObj: GLhandleARB; index: GLuint; maxLength: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PChar ); external name '_glGetActiveAttribARB';
-function glGetAttribLocationARB( programObj: GLhandleARB; const name: PChar ): GLint; external name '_glGetAttribLocationARB';
+procedure glBindAttribLocationARB( programObj: GLhandleARB; index: GLuint; const name: PAnsiChar ); external name '_glBindAttribLocationARB';
+procedure glGetActiveAttribARB( programObj: GLhandleARB; index: GLuint; maxLength: GLsizei; length: PGLsizei; size: PGLint; typ: PGLenum; name: PAnsiChar ); external name '_glGetActiveAttribARB';
+function glGetAttribLocationARB( programObj: GLhandleARB; const name: PAnsiChar ): GLint; external name '_glGetAttribLocationARB';
 {$endc} { GL_GLEXT_FUNCTION_POINTERS }
 {$endc} { GL_GLEXT_FUNCTION_POINTERS }
 {$endc}
 {$endc}
 
 
@@ -4281,9 +4281,9 @@ type
 	glBindBufferBaseEXTProcPtr = procedure( target: GLenum; index: GLuint; buffer: GLuint );
 	glBindBufferBaseEXTProcPtr = procedure( target: GLenum; index: GLuint; buffer: GLuint );
 	glBeginTransformFeedbackEXTProcPtr = procedure( primitiveMode: GLenum );
 	glBeginTransformFeedbackEXTProcPtr = procedure( primitiveMode: GLenum );
 	glEndTransformFeedbackEXTProcPtr = procedure;
 	glEndTransformFeedbackEXTProcPtr = procedure;
-	glTransformFeedbackVaryingsEXTProcPtr = procedure( program_: GLuint; count: GLsizei; {const} varyings: PPChar; bufferMode: GLenum );
+	glTransformFeedbackVaryingsEXTProcPtr = procedure( program_: GLuint; count: GLsizei; {const} varyings: PPAnsiChar; bufferMode: GLenum );
 
 
-	glGetTransformFeedbackVaryingEXTProcPtr = procedure( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLsizei; typ: PGLenum; name: PChar );
+	glGetTransformFeedbackVaryingEXTProcPtr = procedure( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLsizei; typ: PGLenum; name: PAnsiChar );
 {$elsec}
 {$elsec}
 procedure glBindBufferRangeEXT( target: GLenum; index: GLuint; buffer: GLuint; offset: GLintptr; size: GLsizeiptr ); external name '_glBindBufferRangeEXT';
 procedure glBindBufferRangeEXT( target: GLenum; index: GLuint; buffer: GLuint; offset: GLintptr; size: GLsizeiptr ); external name '_glBindBufferRangeEXT';
 procedure glBindBufferOffsetEXT( target: GLenum; index: GLuint; buffer: GLuint; offset: GLintptr ); external name '_glBindBufferOffsetEXT';
 procedure glBindBufferOffsetEXT( target: GLenum; index: GLuint; buffer: GLuint; offset: GLintptr ); external name '_glBindBufferOffsetEXT';
@@ -4291,9 +4291,9 @@ procedure glBindBufferBaseEXT( target: GLenum; index: GLuint; buffer: GLuint );
 procedure glBeginTransformFeedbackEXT( primitiveMode: GLenum ); external name '_glBeginTransformFeedbackEXT';
 procedure glBeginTransformFeedbackEXT( primitiveMode: GLenum ); external name '_glBeginTransformFeedbackEXT';
 procedure glEndTransformFeedbackEXT; external name '_glEndTransformFeedbackEXT';
 procedure glEndTransformFeedbackEXT; external name '_glEndTransformFeedbackEXT';
 
 
-procedure glTransformFeedbackVaryingsEXT( program_: GLuint; count: GLsizei; {const} varyings: PPChar; bufferMode: GLenum ); external name '_glTransformFeedbackVaryingsEXT';
+procedure glTransformFeedbackVaryingsEXT( program_: GLuint; count: GLsizei; {const} varyings: PPAnsiChar; bufferMode: GLenum ); external name '_glTransformFeedbackVaryingsEXT';
 
 
-procedure glGetTransformFeedbackVaryingEXT( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLsizei; typ: PGLenum; name: PChar ); external name '_glGetTransformFeedbackVaryingEXT';
+procedure glGetTransformFeedbackVaryingEXT( program_: GLuint; index: GLuint; bufSize: GLsizei; length: PGLsizei; size: PGLsizei; typ: PGLenum; name: PAnsiChar ); external name '_glGetTransformFeedbackVaryingEXT';
 {$endc}
 {$endc}
 {$endc} { GL_EXT_transform_feedback }
 {$endc} { GL_EXT_transform_feedback }
 
 
@@ -4375,8 +4375,8 @@ type
 	glUniform3uivEXTProcPtr = procedure( location: GLint; count: GLsizei; const value: PGLuint );
 	glUniform3uivEXTProcPtr = procedure( location: GLint; count: GLsizei; const value: PGLuint );
 	glUniform4uivEXTProcPtr = procedure( location: GLint; count: GLsizei; const value: PGLuint );
 	glUniform4uivEXTProcPtr = procedure( location: GLint; count: GLsizei; const value: PGLuint );
 	glGetUniformuivEXTProcPtr = procedure( program_: GLuint; location: GLint; params: PGLuint );
 	glGetUniformuivEXTProcPtr = procedure( program_: GLuint; location: GLint; params: PGLuint );
-	glBindFragDataLocationEXTProcPtr = procedure( program_: GLuint; colorNumber: GLuint; const name: PChar );
-	glGetFragDataLocationEXTProcPtr = function( program_: GLuint; const name: PChar ): GLint;
+	glBindFragDataLocationEXTProcPtr = procedure( program_: GLuint; colorNumber: GLuint; const name: PAnsiChar );
+	glGetFragDataLocationEXTProcPtr = function( program_: GLuint; const name: PAnsiChar ): GLint;
 {$elsec}
 {$elsec}
 procedure glVertexAttribI1iEXT( index: GLuint; x: GLint ); external name '_glVertexAttribI1iEXT';
 procedure glVertexAttribI1iEXT( index: GLuint; x: GLint ); external name '_glVertexAttribI1iEXT';
 procedure glVertexAttribI2iEXT( index: GLuint; x: GLint; y: GLint ); external name '_glVertexAttribI2iEXT';
 procedure glVertexAttribI2iEXT( index: GLuint; x: GLint; y: GLint ); external name '_glVertexAttribI2iEXT';
@@ -4410,8 +4410,8 @@ procedure glUniform2uivEXT( location: GLint; count: GLsizei; const value: PGLuin
 procedure glUniform3uivEXT( location: GLint; count: GLsizei; const value: PGLuint ); external name '_glUniform3uivEXT';
 procedure glUniform3uivEXT( location: GLint; count: GLsizei; const value: PGLuint ); external name '_glUniform3uivEXT';
 procedure glUniform4uivEXT( location: GLint; count: GLsizei; const value: PGLuint ); external name '_glUniform4uivEXT';
 procedure glUniform4uivEXT( location: GLint; count: GLsizei; const value: PGLuint ); external name '_glUniform4uivEXT';
 procedure glGetUniformuivEXT( program_: GLuint; location: GLint; params: PGLuint ); external name '_glGetUniformuivEXT';
 procedure glGetUniformuivEXT( program_: GLuint; location: GLint; params: PGLuint ); external name '_glGetUniformuivEXT';
-procedure glBindFragDataLocationEXT( program_: GLuint; colorNumber: GLuint; const name: PChar ); external name '_glBindFragDataLocationEXT';
-function glGetFragDataLocationEXT( program_: GLuint; const name: PChar ): GLint; external name '_glGetFragDataLocationEXT';
+procedure glBindFragDataLocationEXT( program_: GLuint; colorNumber: GLuint; const name: PAnsiChar ); external name '_glBindFragDataLocationEXT';
+function glGetFragDataLocationEXT( program_: GLuint; const name: PAnsiChar ): GLint; external name '_glGetFragDataLocationEXT';
 {$endc}
 {$endc}
 {$endc} { GL_EXT_gpu_shader4 }
 {$endc} { GL_EXT_gpu_shader4 }
 
 

+ 3 - 3
packages/univint/src/macglu.pas

@@ -562,7 +562,7 @@ function gluBuild2DMipmapLevels( target: GLenum; internalFormat: GLint; width: G
 function gluBuild2DMipmaps( target: GLenum; internalFormat: GLint; width: GLsizei; height: GLsizei; format: GLenum; typ: GLenum; data: {const} UnivPtr ): GLint; external name '_gluBuild2DMipmaps';
 function gluBuild2DMipmaps( target: GLenum; internalFormat: GLint; width: GLsizei; height: GLsizei; format: GLenum; typ: GLenum; data: {const} UnivPtr ): GLint; external name '_gluBuild2DMipmaps';
 function gluBuild3DMipmapLevels( target: GLenum; internalFormat: GLint; width: GLsizei; height: GLsizei; depth: GLsizei; format: GLenum; typ: GLenum; level: GLint; base: GLint; max: GLint; data: {const} UnivPtr ): GLint; external name '_gluBuild3DMipmapLevels';
 function gluBuild3DMipmapLevels( target: GLenum; internalFormat: GLint; width: GLsizei; height: GLsizei; depth: GLsizei; format: GLenum; typ: GLenum; level: GLint; base: GLint; max: GLint; data: {const} UnivPtr ): GLint; external name '_gluBuild3DMipmapLevels';
 function gluBuild3DMipmaps( target: GLenum; internalFormat: GLint; width: GLsizei; height: GLsizei; depth: GLsizei; format: GLenum; typ: GLenum; data: {const} UnivPtr ): GLint; external name '_gluBuild3DMipmaps';
 function gluBuild3DMipmaps( target: GLenum; internalFormat: GLint; width: GLsizei; height: GLsizei; depth: GLsizei; format: GLenum; typ: GLenum; data: {const} UnivPtr ): GLint; external name '_gluBuild3DMipmaps';
-function gluCheckExtension( const extName: PChar; const extString: PChar ): GLboolean; external name '_gluCheckExtension';
+function gluCheckExtension( const extName: PAnsiChar; const extString: PAnsiChar ): GLboolean; external name '_gluCheckExtension';
 procedure gluCylinder( quad: PGLUquadric; base: GLdouble; top: GLdouble; height: GLdouble; slices: GLint; stacks: GLint ); external name '_gluCylinder';
 procedure gluCylinder( quad: PGLUquadric; base: GLdouble; top: GLdouble; height: GLdouble; slices: GLint; stacks: GLint ); external name '_gluCylinder';
 procedure gluDeleteNurbsRenderer( nurb: PGLUnurbs ); external name '_gluDeleteNurbsRenderer';
 procedure gluDeleteNurbsRenderer( nurb: PGLUnurbs ); external name '_gluDeleteNurbsRenderer';
 procedure gluDeleteQuadric( quad: PGLUquadric ); external name '_gluDeleteQuadric';
 procedure gluDeleteQuadric( quad: PGLUquadric ); external name '_gluDeleteQuadric';
@@ -572,9 +572,9 @@ procedure gluEndCurve( nurb: PGLUnurbs ); external name '_gluEndCurve';
 procedure gluEndPolygon( tess: PGLUtesselator ); external name '_gluEndPolygon';
 procedure gluEndPolygon( tess: PGLUtesselator ); external name '_gluEndPolygon';
 procedure gluEndSurface( nurb: PGLUnurbs ); external name '_gluEndSurface';
 procedure gluEndSurface( nurb: PGLUnurbs ); external name '_gluEndSurface';
 procedure gluEndTrim( nurb: PGLUnurbs ); external name '_gluEndTrim';
 procedure gluEndTrim( nurb: PGLUnurbs ); external name '_gluEndTrim';
-function gluErrorString( error: GLenum ): PChar; external name '_gluErrorString';
+function gluErrorString( error: GLenum ): PAnsiChar; external name '_gluErrorString';
 procedure gluGetNurbsProperty( nurb: pGLUnurbs; property: GLenum; data: PGLfloat ); external name '_gluGetNurbsProperty';
 procedure gluGetNurbsProperty( nurb: pGLUnurbs; property: GLenum; data: PGLfloat ); external name '_gluGetNurbsProperty';
-function gluGetString( name: GLenum ): PChar; external name '_gluGetString';
+function gluGetString( name: GLenum ): PAnsiChar; external name '_gluGetString';
 procedure gluGetTessProperty( tess: PGLUtesselator; which: GLenum; data: PGLdouble ); external name '_gluGetTessProperty';
 procedure gluGetTessProperty( tess: PGLUtesselator; which: GLenum; data: PGLdouble ); external name '_gluGetTessProperty';
 procedure gluLoadSamplingMatrices( nurb: PGLUnurbs; const model: PGLfloat; const perspective: PGLfloat; const view: PGLint ); external name '_gluLoadSamplingMatrices';
 procedure gluLoadSamplingMatrices( nurb: PGLUnurbs; const model: PGLfloat; const perspective: PGLfloat; const view: PGLint ); external name '_gluLoadSamplingMatrices';
 procedure gluLookAt( eyeX: GLdouble; eyeY: GLdouble; eyeZ: GLdouble; centerX: GLdouble; centerY: GLdouble; centerZ: GLdouble; upX: GLdouble; upY: GLdouble; upZ: GLdouble ); external name '_gluLookAt';
 procedure gluLookAt( eyeX: GLdouble; eyeY: GLdouble; eyeZ: GLdouble; centerX: GLdouble; centerY: GLdouble; centerZ: GLdouble; upX: GLdouble; upY: GLdouble; upZ: GLdouble ); external name '_gluLookAt';

+ 2 - 2
packages/univint/src/vDSP.pas

@@ -3880,7 +3880,7 @@ procedure vDSP_vfixru32D( __vDSP_A: Float64Ptr; __vDSP_I: vDSP_Stride; __vDSP_C:
  *    CarbonLib:        not available
  *    CarbonLib:        not available
  *    Non-Carbon CFM:   not available
  *    Non-Carbon CFM:   not available
  }
  }
-procedure vDSP_vflt8( var A: char; __vDSP_I: vDSP_Stride; __vDSP_C: Float32Ptr; __vDSP_K: vDSP_Stride; __vDSP_N: vDSP_Length ); external name '_vDSP_vflt8';
+procedure vDSP_vflt8( var A: AnsiChar; __vDSP_I: vDSP_Stride; __vDSP_C: Float32Ptr; __vDSP_K: vDSP_Stride; __vDSP_N: vDSP_Length ); external name '_vDSP_vflt8';
 (* __OSX_AVAILABLE_STARTING(__MAC_10_4, __IPHONE_4_0) *)
 (* __OSX_AVAILABLE_STARTING(__MAC_10_4, __IPHONE_4_0) *)
 
 
 
 
@@ -3893,7 +3893,7 @@ procedure vDSP_vflt8( var A: char; __vDSP_I: vDSP_Stride; __vDSP_C: Float32Ptr;
  *    CarbonLib:        not available
  *    CarbonLib:        not available
  *    Non-Carbon CFM:   not available
  *    Non-Carbon CFM:   not available
  }
  }
-procedure vDSP_vflt8D( var A: char; __vDSP_I: vDSP_Stride; __vDSP_C: Float64Ptr; __vDSP_K: vDSP_Stride; __vDSP_N: vDSP_Length ); external name '_vDSP_vflt8D';
+procedure vDSP_vflt8D( var A: AnsiChar; __vDSP_I: vDSP_Stride; __vDSP_C: Float64Ptr; __vDSP_K: vDSP_Stride; __vDSP_N: vDSP_Length ); external name '_vDSP_vflt8D';
 (* __OSX_AVAILABLE_STARTING(__MAC_10_4, __IPHONE_4_0) *)
 (* __OSX_AVAILABLE_STARTING(__MAC_10_4, __IPHONE_4_0) *)