* reparsed with latest version of parser

  - disabled some headers for 64 bit platforms that are not available there
  * updated cocoa patch to adjust missed unions by the parser
  -> when compiled with current compiler, all field offsets
     and instance sizes should now match gcc's exactly


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@18122 3ad0048d-3df7-0310-abae-a5850022a9f2

26 files changed, 64 insertions, 47 deletions

diff --git a/packages/cocoaint/src/foundation/NSAppleEventDescriptor.inc b/packages/cocoaint/src/foundation/NSAppleEventDescriptor.inc
index ca9c475431..0ec00b0b60 100644
--- a/packages/cocoaint/src/foundation/NSAppleEventDescriptor.inc
+++ b/packages/cocoaint/src/foundation/NSAppleEventDescriptor.inc
@@ -44,7 +44,7 @@
   private
     _desc: AEDesc;
     _hasValidDesc: Boolean;
-        _padding: array[0..2] of char;
+    _padding: array[0..(3)-1] of char;
     
   public
     class function nullDescriptor: NSAppleEventDescriptor; message 'nullDescriptor';
diff --git a/packages/cocoaint/src/foundation/NSAppleEventManager.inc b/packages/cocoaint/src/foundation/NSAppleEventManager.inc
index ea39b86cb4..78092b5df8 100644
--- a/packages/cocoaint/src/foundation/NSAppleEventManager.inc
+++ b/packages/cocoaint/src/foundation/NSAppleEventManager.inc
@@ -57,7 +57,7 @@ var
   NSAppleEventManager = objcclass external (NSObject)
   private
     _isPreparedForDispatch: Boolean;
-        _padding: array[0..2] of char;
+    _padding: array[0..(3)-1] of char;
     
   public
     class function sharedAppleEventManager: NSAppleEventManager; message 'sharedAppleEventManager';
diff --git a/packages/cocoaint/src/foundation/NSCache.inc b/packages/cocoaint/src/foundation/NSCache.inc
index ba757b747a..53f771dd0f 100644
--- a/packages/cocoaint/src/foundation/NSCache.inc
+++ b/packages/cocoaint/src/foundation/NSCache.inc
@@ -44,7 +44,7 @@
   NSCache = objcclass external (NSObject)
   private
     _delegate: id;
-        _private: array[0..4] of Pointer;
+    _private: array[0..(5)-1] of Pointer;
     _reserved: Pointer;
     
   public
diff --git a/packages/cocoaint/src/foundation/NSConnection.inc b/packages/cocoaint/src/foundation/NSConnection.inc
index c82ebec990..2679490a90 100644
--- a/packages/cocoaint/src/foundation/NSConnection.inc
+++ b/packages/cocoaint/src/foundation/NSConnection.inc
@@ -64,10 +64,10 @@ var
     isDead: char;
     _isValid: char;
     wantsInvalid: char;
-    _anoninternstruct_NSConnection0: bitpacked record
+    _anoninternstruct_NSConnection0: record
       case byte of
        0: (_anonbitfield_NSConnection0: char);
-       1: (
+       1: (data: bitpacked record
         authGen: 0..1;
         authCheck: 0..1;
         encryptFlag: 0..1;
@@ -76,6 +76,7 @@ var
         isQueueing: 0..1;
         isMulti: 0..1;
         invalidateRP: 0..1;
+       end;
       );
       end;
     ___1: id;
diff --git a/packages/cocoaint/src/foundation/NSData.inc b/packages/cocoaint/src/foundation/NSData.inc
index acc7a263cc..75eb67ab8b 100644
--- a/packages/cocoaint/src/foundation/NSData.inc
+++ b/packages/cocoaint/src/foundation/NSData.inc
@@ -101,7 +101,7 @@ type
   private
     _length: NSUInteger;
     _accessCount: cint32;
-        _private: array[0..31] of cuint8;
+    _private: array[0..(32)-1] of cuint8;
     _reserved: Pointer;
     
   public
diff --git a/packages/cocoaint/src/foundation/NSDecimal.inc b/packages/cocoaint/src/foundation/NSDecimal.inc
index f4c4ef3085..52729c1c03 100644
--- a/packages/cocoaint/src/foundation/NSDecimal.inc
+++ b/packages/cocoaint/src/foundation/NSDecimal.inc
@@ -40,12 +40,17 @@ const
 { Records }
 type
   NSDecimal = record
-    _exponent: 0..((1 shl 8)-1);
-    _length: 0..((1 shl 4)-1);
-    _isNegative: 0..1;
-    _isCompact: 0..1;
-    _reserved: 0..((1 shl 18)-1);
-    _mantissa: cushort;
+    case byte of
+    0: (_anonbitfield_NSDecimal0: cint);
+    1: (data: bitpacked record
+          _exponent: 0..((1 shl 8)-1);
+          _length: 0..((1 shl 4)-1);
+          _isNegative: 0..1;
+          _isCompact: 0..1;
+          _reserved: 0..((1 shl 18)-1);
+          _mantissa: array[0..(NSDecimalMaxSize)-1] of cushort;
+         end;
+       );
   end;
 NSDecimalPtr = ^NSDecimal;
 
diff --git a/packages/cocoaint/src/foundation/NSDecimalNumber.inc b/packages/cocoaint/src/foundation/NSDecimalNumber.inc
index 4f9568c93a..be354820d0 100644
--- a/packages/cocoaint/src/foundation/NSDecimalNumber.inc
+++ b/packages/cocoaint/src/foundation/NSDecimalNumber.inc
@@ -53,10 +53,10 @@ var
 { NSDecimalNumber }
   NSDecimalNumber = objcclass external (NSNumber)
   private
-    _anoninternstruct_NSDecimalNumber0: bitpacked record
+    _anoninternstruct_NSDecimalNumber0: record
       case byte of
        0: (_anonbitfield_NSDecimalNumber0: cint);
-       1: (
+       1: (data: bitpacked record
         _exponent: 0..((1 shl 8)-1);
         _length: 0..((1 shl 4)-1);
         _isNegative: 0..1;
@@ -64,9 +64,10 @@ var
         _reserved: 0..1;
         _hasExternalRefCount: 0..1;
         _refs: 0..((1 shl 16)-1);
+       end;
       );
       end;
-    _mantissa: cushort;
+    _mantissa: record end; { array of 0 elements in C, does not allocate space }
     
   public
     function initWithMantissa_exponent_isNegative(mantissa: culonglong; exponent: cshort; flag: Boolean): id; message 'initWithMantissa:exponent:isNegative:';
@@ -107,10 +108,10 @@ var
 { NSDecimalNumberHandler }
   NSDecimalNumberHandler = objcclass external (NSObject, NSDecimalNumberBehaviorsProtocol, NSCodingProtocol)
   private
-    _anoninternstruct_NSDecimalNumber1: bitpacked record
+    _anoninternstruct_NSDecimalNumber1: record
       case byte of
        0: (_anonbitfield_NSDecimalNumber1: cint);
-       1: (
+       1: (data: bitpacked record
         _scale: 0..((1 shl 16)-1);
         _roundingMode: 0..((1 shl 3)-1);
         _raiseOnExactness: 0..1;
@@ -118,6 +119,7 @@ var
         _raiseOnUnderflow: 0..1;
         _raiseOnDivideByZero: 0..1;
         _unused: 0..((1 shl 9)-1);
+       end;
       );
       end;
     _reserved2: Pointer;
diff --git a/packages/cocoaint/src/foundation/NSEnumerator.inc b/packages/cocoaint/src/foundation/NSEnumerator.inc
index a84948ce0b..1f4d8a7be9 100644
--- a/packages/cocoaint/src/foundation/NSEnumerator.inc
+++ b/packages/cocoaint/src/foundation/NSEnumerator.inc
@@ -17,7 +17,7 @@ type
     state: culong;
     itemsPtr: idPtr;
     mutationsPtr: pculong;
-        extra: array[0..4] of culong;
+    extra: array[0..(5)-1] of culong;
   end;
 NSFastEnumerationStatePtr = ^NSFastEnumerationState;
 
diff --git a/packages/cocoaint/src/foundation/NSIndexSet.inc b/packages/cocoaint/src/foundation/NSIndexSet.inc
index 50ea0f69a1..8d76554d43 100644
--- a/packages/cocoaint/src/foundation/NSIndexSet.inc
+++ b/packages/cocoaint/src/foundation/NSIndexSet.inc
@@ -45,25 +45,31 @@
 { NSIndexSet }
   NSIndexSet = objcclass external (NSObject, NSCopyingProtocol, NSMutableCopyingProtocol, NSCodingProtocol)
   private
-    __indexSetFlags: bitpacked record
+    __indexSetFlags: record
       case byte of
        0: (_anonbitfield_NSIndexSet0: NSUInteger);
-       1: (
+       1: (data: bitpacked record
         _isEmpty: 0..1;
         _hasSingleRange: 0..1;
         _cacheValid: 0..1;
         _reservedArrayBinderController: 0..((1 shl 29)-1);
+       end;
       );
       end;
+    _internal: record
+      case byte of
+        0: (
     __singleRange: record
         _range: NSRange;
       end;
+           );
+	1: (
     __multipleRanges: record
         _data: Pointer; {garbage collector: __strong }
         _reserved: Pointer;
       end;
-    __internal: record
-      end;
+           );
+    end;
     
   public
     class function indexSet: id; message 'indexSet';
diff --git a/packages/cocoaint/src/foundation/NSInvocation.inc b/packages/cocoaint/src/foundation/NSInvocation.inc
index af0de1df3c..3a5fdd5547 100644
--- a/packages/cocoaint/src/foundation/NSInvocation.inc
+++ b/packages/cocoaint/src/foundation/NSInvocation.inc
@@ -72,7 +72,7 @@ valuePtr = ^value;
     _signature: id;
     _container: id;
     _retainedArgs: cuint8;
-        _reserved: array[0..14] of cuint8;
+    _reserved: array[0..(15)-1] of cuint8;
     
   public
     class function invocationWithMethodSignature(sig: NSMethodSignature): NSInvocation; message 'invocationWithMethodSignature:';
diff --git a/packages/cocoaint/src/foundation/NSMetadata.inc b/packages/cocoaint/src/foundation/NSMetadata.inc
index a90c88749f..98f50411ea 100644
--- a/packages/cocoaint/src/foundation/NSMetadata.inc
+++ b/packages/cocoaint/src/foundation/NSMetadata.inc
@@ -65,7 +65,7 @@ var
   private
     _flags: NSUInteger;
     _interval: NSTimeInterval;
-        _private: array[0..10] of id;
+    _private: array[0..(11)-1] of id;
     _reserved: Pointer; {garbage collector: __strong }
     
   public
@@ -129,8 +129,8 @@ var
 { NSMetadataQueryResultGroup }
   NSMetadataQueryResultGroup = objcclass external (NSObject)
   private
-        _private: array[0..8] of id;
-    _private2: NSUInteger;
+    _private: array[0..(9)-1] of id;
+    _private2: array[0..(1)-1] of NSUInteger;
     _reserved: Pointer;
     
   public
diff --git a/packages/cocoaint/src/foundation/NSMethodSignature.inc b/packages/cocoaint/src/foundation/NSMethodSignature.inc
index e8faf84a1a..bacf58d12a 100644
--- a/packages/cocoaint/src/foundation/NSMethodSignature.inc
+++ b/packages/cocoaint/src/foundation/NSMethodSignature.inc
@@ -43,7 +43,7 @@
   NSMethodSignature = objcclass external (NSObject)
   private
     _private: Pointer;
-        _reserved: array[0..5] of Pointer;
+    _reserved: array[0..(6)-1] of Pointer;
     
   public
     class function signatureWithObjCTypes(types: PChar): NSMethodSignature; message 'signatureWithObjCTypes:';
diff --git a/packages/cocoaint/src/foundation/NSNotification.inc b/packages/cocoaint/src/foundation/NSNotification.inc
index 13494b29cd..2bf91cd1c5 100644
--- a/packages/cocoaint/src/foundation/NSNotification.inc
+++ b/packages/cocoaint/src/foundation/NSNotification.inc
@@ -60,8 +60,8 @@
   NSNotificationCenter = objcclass external (NSObject)
   private
     _impl: Pointer; {garbage collector: __strong }
-        _callback_block: array[0..3] of Pointer;
-        _pad: array[0..7] of Pointer;
+    _callback_block: array[0..(4)-1] of Pointer;
+    _pad: array[0..(8)-1] of Pointer;
     
   public
     class function defaultCenter: id; message 'defaultCenter';
diff --git a/packages/cocoaint/src/foundation/NSNumberFormatter.inc b/packages/cocoaint/src/foundation/NSNumberFormatter.inc
index 2f78981036..9c1ba8e105 100644
--- a/packages/cocoaint/src/foundation/NSNumberFormatter.inc
+++ b/packages/cocoaint/src/foundation/NSNumberFormatter.inc
@@ -86,7 +86,7 @@ type
     _attributes: NSMutableDictionary;
     _formatter: CFNumberFormatterRef; {garbage collector: __strong }
     _counter: NSUInteger;
-        _reserved: array[0..11] of Pointer;
+    _reserved: array[0..(12)-1] of Pointer;
     
   public
     function getObjectValue_forString_range_error(obj: idPtr; string_: NSString; rangep: NSRangePtr; error: NSErrorPointer): Boolean; message 'getObjectValue:forString:range:error:';
diff --git a/packages/cocoaint/src/foundation/NSPropertyList.inc b/packages/cocoaint/src/foundation/NSPropertyList.inc
index adaae06e49..f60fabeac8 100644
--- a/packages/cocoaint/src/foundation/NSPropertyList.inc
+++ b/packages/cocoaint/src/foundation/NSPropertyList.inc
@@ -63,7 +63,7 @@ type
 { NSPropertyListSerialization }
   NSPropertyListSerialization = objcclass external (NSObject)
   private
-        reserved: array[0..5] of Pointer;
+    reserved: array[0..(6)-1] of Pointer;
     
   public
     class function propertyList_isValidForFormat(plist: id; format: NSPropertyListFormat): Boolean; message 'propertyList:isValidForFormat:';
diff --git a/packages/cocoaint/src/foundation/NSRunLoop.inc b/packages/cocoaint/src/foundation/NSRunLoop.inc
index 353ebcde1e..5a08e09ad3 100644
--- a/packages/cocoaint/src/foundation/NSRunLoop.inc
+++ b/packages/cocoaint/src/foundation/NSRunLoop.inc
@@ -52,7 +52,7 @@ var
     _perft: id;
     _info: id;
     _ports: id;
-        _reserved: array[0..5] of Pointer;
+    _reserved: array[0..(6)-1] of Pointer;
     
   public
     class function currentRunLoop: NSRunLoop; message 'currentRunLoop';
diff --git a/packages/cocoaint/src/foundation/NSScriptCommand.inc b/packages/cocoaint/src/foundation/NSScriptCommand.inc
index 5735735db2..b014efa195 100644
--- a/packages/cocoaint/src/foundation/NSScriptCommand.inc
+++ b/packages/cocoaint/src/foundation/NSScriptCommand.inc
@@ -63,13 +63,14 @@ const
     _evaluatedReceivers: id;
     _arguments: NSDictionary;
     _evaluatedArguments: NSMutableDictionary;
-    __flags: bitpacked record
+    __flags: record
       case byte of
        0: (_anonbitfield_NSScriptCommand0: cuint);
-       1: (
+       1: (data: bitpacked record
         hasEvaluatedReceivers: 0..1;
         hasEvaluatedArguments: 0..1;
         RESERVED: 0..((1 shl 30)-1);
+       end;
       );
       end;
     _moreVars: id;
diff --git a/packages/cocoaint/src/foundation/NSScriptObjectSpecifiers.inc b/packages/cocoaint/src/foundation/NSScriptObjectSpecifiers.inc
index ea6e5e0f4b..ebd715c6bc 100644
--- a/packages/cocoaint/src/foundation/NSScriptObjectSpecifiers.inc
+++ b/packages/cocoaint/src/foundation/NSScriptObjectSpecifiers.inc
@@ -116,7 +116,7 @@ type
     _containerClassDescription: NSScriptClassDescription;
     _containerIsObjectBeingTested: Boolean;
     _containerIsRangeContainerObject: Boolean;
-        _padding: array[0..1] of char;
+    _padding: array[0..(2)-1] of char;
     _descriptor: NSAppleEventDescriptor;
     _error: NSInteger;
     
diff --git a/packages/cocoaint/src/foundation/NSScriptSuiteRegistry.inc b/packages/cocoaint/src/foundation/NSScriptSuiteRegistry.inc
index f059e939ef..3810b6a128 100644
--- a/packages/cocoaint/src/foundation/NSScriptSuiteRegistry.inc
+++ b/packages/cocoaint/src/foundation/NSScriptSuiteRegistry.inc
@@ -43,7 +43,7 @@
   NSScriptSuiteRegistry = objcclass external (NSObject)
   private
     _isLoadingSDEFFiles: Boolean;
-        _reserved1: array[0..2] of char;
+    _reserved1: array[0..(3)-1] of char;
     _seenBundles: NSMutableSet;
     _suiteDescriptionsBeingCollected: NSMutableArray;
     _classDescriptionNeedingRegistration: NSScriptClassDescription;
@@ -55,7 +55,7 @@
     _complexTypeDescriptionsByName: NSMutableDictionary;
     _listTypeDescriptionsByName: NSMutableDictionary;
     _nextComplexTypeAppleEventCode: cuint;
-        _reserved2: array[0..3] of Pointer;
+    _reserved2: array[0..(4)-1] of Pointer;
     
   public
     class function sharedScriptSuiteRegistry: NSScriptSuiteRegistry; message 'sharedScriptSuiteRegistry';
diff --git a/packages/cocoaint/src/foundation/NSSpellServer.inc b/packages/cocoaint/src/foundation/NSSpellServer.inc
index 875e41449d..c59bf241cf 100644
--- a/packages/cocoaint/src/foundation/NSSpellServer.inc
+++ b/packages/cocoaint/src/foundation/NSSpellServer.inc
@@ -54,14 +54,15 @@ var
     _spellServerConnection: id;
     _dictionaries: id;
     _learnedDictionaries: NSArray;
-    __ssFlags: bitpacked record
+    __ssFlags: record
       case byte of
        0: (_anonbitfield_NSSpellServer0: cuint);
-       1: (
+       1: (data: bitpacked record
         delegateLearnsWords: 0..1;
         delegateForgetsWords: 0..1;
         busy: 0..1;
         _reserved: 0..((1 shl 29)-1);
+       end;
       );
       end;
     _reservedSpellServer1: Pointer;
diff --git a/packages/cocoaint/src/foundation/NSThread.inc b/packages/cocoaint/src/foundation/NSThread.inc
index 4c73e92764..b3442e98ad 100644
--- a/packages/cocoaint/src/foundation/NSThread.inc
+++ b/packages/cocoaint/src/foundation/NSThread.inc
@@ -49,7 +49,7 @@ var
   NSThread = objcclass external (NSObject)
   private
     _private: id;
-        _bytes: array[0..43] of cuint8;
+    _bytes: array[0..(44)-1] of cuint8;
     
   public
     class function currentThread: NSThread; message 'currentThread';
diff --git a/packages/cocoaint/src/foundation/NSUndoManager.inc b/packages/cocoaint/src/foundation/NSUndoManager.inc
index caa0e86f61..f2699443c1 100644
--- a/packages/cocoaint/src/foundation/NSUndoManager.inc
+++ b/packages/cocoaint/src/foundation/NSUndoManager.inc
@@ -61,16 +61,17 @@ var
     _redoStack: id;
     _runLoopModes: NSArray;
     _disabled: NSInteger;
-    __flags: bitpacked record
+    __flags: record
       case byte of
        0: (_anonbitfield_NSUndoManager0: cuint);
-       1: (
+       1: (data: bitpacked record
         undoing: 0..1;
         redoing: 0..1;
         registeredForCallback: 0..1;
         postingCheckpointNotification: 0..1;
         _groupsByEvent: 0..1;
         reserved: 0..((1 shl 27)-1);
+       end;
       );
       end;
     _target: id;
diff --git a/packages/cocoaint/src/foundation/NSUserDefaults.inc b/packages/cocoaint/src/foundation/NSUserDefaults.inc
index 72ee4bcb73..4f620275cc 100644
--- a/packages/cocoaint/src/foundation/NSUserDefaults.inc
+++ b/packages/cocoaint/src/foundation/NSUserDefaults.inc
@@ -76,7 +76,7 @@ var
   NSUserDefaults = objcclass external (NSObject)
   private
     _private: id;
-        _reserved: array[0..3] of Pointer;
+    _reserved: array[0..(4)-1] of Pointer;
     
   public
     class function standardUserDefaults: NSUserDefaults; message 'standardUserDefaults';
diff --git a/packages/cocoaint/src/foundation/NSXMLDTD.inc b/packages/cocoaint/src/foundation/NSXMLDTD.inc
index 12b305ffac..a9ec26a191 100644
--- a/packages/cocoaint/src/foundation/NSXMLDTD.inc
+++ b/packages/cocoaint/src/foundation/NSXMLDTD.inc
@@ -47,14 +47,14 @@
     _systemID: NSString;
     _children: NSArray;
     _childrenHaveMutated: Boolean;
-        _padding3: array[0..2] of cuint8;
+    _padding3: array[0..(3)-1] of cuint8;
     _entities: NSMutableDictionary;
     _elements: NSMutableDictionary;
     _notations: NSMutableDictionary;
     _attributes: NSMutableDictionary;
     _original: NSString;
     _modified: Boolean;
-        _padding2: array[0..2] of cuint8;
+    _padding2: array[0..(3)-1] of cuint8;
     
   public
     function initWithContentsOfURL_options_error(url: NSURL; mask: NSUInteger; error: NSErrorPointer): id; message 'initWithContentsOfURL:options:error:';
diff --git a/packages/cocoaint/src/foundation/NSXMLDocument.inc b/packages/cocoaint/src/foundation/NSXMLDocument.inc
index 64c6202946..44085be952 100644
--- a/packages/cocoaint/src/foundation/NSXMLDocument.inc
+++ b/packages/cocoaint/src/foundation/NSXMLDocument.inc
@@ -61,7 +61,7 @@ type
     _children: NSArray;
     _childrenHaveMutated: Boolean;
     _standalone: Boolean;
-        _padding3: array[0..1] of cuint8;
+    _padding3: array[0..(2)-1] of cuint8;
     _rootElement: NSXMLElement;
     _URI: NSString;
     _MIMEType: NSString;
diff --git a/packages/cocoaint/src/foundation/NSXMLElement.inc b/packages/cocoaint/src/foundation/NSXMLElement.inc
index 5b4bac6f70..fb86ec2c29 100644
--- a/packages/cocoaint/src/foundation/NSXMLElement.inc
+++ b/packages/cocoaint/src/foundation/NSXMLElement.inc
@@ -47,7 +47,7 @@
     _namespaces: NSMutableArray;
     _children: NSArray;
     _childrenHaveMutated: Boolean;
-        _padding3: array[0..2] of cuint8;
+    _padding3: array[0..(3)-1] of cuint8;
     _URI: NSString;
     _prefixIndex: NSInteger;