Merged revisions 3924 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r3924 | jonas | 2006-06-23 13:52:51 +0200 (Fri, 23 Jun 2006) | 6 lines

  * synchronised with r165 of pascal universal interfaces:

 For CMMultichannel5Color and CMMultichannel7Color type declarations,
 corrected number of array elements and added an explicit pad byte field
 for FPC and GPC so that type size matches Apple's gcc type size.

........

git-svn-id: branches/fixes_2_0@3925 -

packages/extra/univint/CMApplication.pas

@@ -314,7 +314,8 @@ type
 
 	CMMultichannel5ColorPtr = ^CMMultichannel5Color;
 	CMMultichannel5Color = record
-		components:				packed array [0..5] of UInt8;			{  0..255  }{one extra pad byte}
+		components:				packed array [0..4] of UInt8;			{  0..255  }
+		pad: UInt8; {pad byte so record size equals Apple gcc struct size}
 	end;
 
 	CMMultichannel6ColorPtr = ^CMMultichannel6Color;
@@ -324,7 +325,8 @@ type
 
 	CMMultichannel7ColorPtr = ^CMMultichannel7Color;
 	CMMultichannel7Color = record
-		components:				packed array [0..7] of UInt8;			{  0..255  }{one extra pad byte}
+		components:				packed array [0..6] of UInt8;			{  0..255  }
+		pad: UInt8; {pad byte so record size equals Apple gcc struct size}
 	end;
 
 	CMMultichannel8ColorPtr = ^CMMultichannel8Color;

packages/extra/univint/FPCMacOSAll.pas

@@ -213846,7 +213846,8 @@ type
 
 	CMMultichannel5ColorPtr = ^CMMultichannel5Color;
 	CMMultichannel5Color = record
-		components:				packed array [0..5] of UInt8;			{  0..255  }{one extra pad byte}
+		components:				packed array [0..4] of UInt8;			{  0..255  }
+		pad: UInt8; {pad byte so record size equals Apple gcc struct size}
 	end;
 
 	CMMultichannel6ColorPtr = ^CMMultichannel6Color;
@@ -213856,7 +213857,8 @@ type
 
 	CMMultichannel7ColorPtr = ^CMMultichannel7Color;
 	CMMultichannel7Color = record
-		components:				packed array [0..7] of UInt8;			{  0..255  }{one extra pad byte}
+		components:				packed array [0..6] of UInt8;			{  0..255  }
+		pad: UInt8; {pad byte so record size equals Apple gcc struct size}
 	end;
 
 	CMMultichannel8ColorPtr = ^CMMultichannel8Color;