Apple compatibility fixups

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24207 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-12-15 11:33:18 +00:00
parent 6b8d9c4555
commit 7d5327c603
7 changed files with 43 additions and 26 deletions

View file

@ -4,6 +4,19 @@
* Source/cifframe.m: * Source/cifframe.m:
* Source/callframe.m: * Source/callframe.m:
Fix error testing whether object is an instance. Fix error testing whether object is an instance.
* Headers/Foundation/NSString.h:
* Headers/Foundation/NSPropertyList.h:
* Headers/Foundation/NSDistributedNotificationCenter.h:
* Headers/Foundation/NSNotificationQueue.h:
* Headers/Foundation/NSGeometry.h:
* Headers/Foundation/NSDecimal.h:
Audit all headers and make more MacOS-X enumeration constant fixups
so that we shouldn't need to break binary compatibility for additions
to the enumeration constants in future (we hope) there is stll the
possibility of apple adding constants which conflict with gnustep
extensions, though I've left a big gap between apple and gnu
values so that conflict should be unlikely unless they specifically
try to do it.
2006-12-14 Richard Frith-Macdonald <rfm@gnu.org> 2006-12-14 Richard Frith-Macdonald <rfm@gnu.org>

View file

@ -51,9 +51,9 @@ extern "C" {
* [(NSDecimalNumberBehaviors)] protocol. * [(NSDecimalNumberBehaviors)] protocol.
*/ */
typedef enum { typedef enum {
NSRoundPlain, /* Round .5 up */
NSRoundDown, NSRoundDown,
NSRoundUp, NSRoundUp,
NSRoundPlain, /* Round .5 up */
NSRoundBankers /* Make last digit even */ NSRoundBankers /* Make last digit even */
} NSRoundingMode; } NSRoundingMode;
@ -75,9 +75,9 @@ typedef enum {
*/ */
typedef enum { typedef enum {
NSCalculationNoError = 0, NSCalculationNoError = 0,
NSCalculationLossOfPrecision,
NSCalculationUnderflow, /* result became zero */ NSCalculationUnderflow, /* result became zero */
NSCalculationOverflow, NSCalculationOverflow,
NSCalculationLossOfPrecision,
NSCalculationDivideByZero NSCalculationDivideByZero
} NSCalculationError; } NSCalculationError;

View file

@ -51,10 +51,10 @@ extern "C" {
</example> </example>
*/ */
typedef enum { typedef enum {
NSNotificationSuspensionBehaviorDrop, NSNotificationSuspensionBehaviorDrop = 1,
NSNotificationSuspensionBehaviorCoalesce, NSNotificationSuspensionBehaviorCoalesce = 2,
NSNotificationSuspensionBehaviorHold, NSNotificationSuspensionBehaviorHold = 3,
NSNotificationSuspensionBehaviorDeliverImmediately NSNotificationSuspensionBehaviorDeliverImmediately = 4
} NSNotificationSuspensionBehavior; } NSNotificationSuspensionBehavior;
/** /**

View file

@ -123,10 +123,10 @@ typedef NSRect *NSRectPointer;
*/ */
typedef enum _NSRectEdge typedef enum _NSRectEdge
{ {
NSMinXEdge, NSMinXEdge = 0,
NSMinYEdge, NSMinYEdge = 1,
NSMaxXEdge, NSMaxXEdge = 2,
NSMaxYEdge NSMaxYEdge = 3
} NSRectEdge; } NSRectEdge;
/** Point at 0,0 */ /** Point at 0,0 */

View file

@ -74,9 +74,9 @@ extern "C" {
</example> </example>
*/ */
typedef enum { typedef enum {
NSPostWhenIdle, NSPostWhenIdle = 1,
NSPostASAP, NSPostASAP = 2,
NSPostNow NSPostNow = 3
} NSPostingStyle; } NSPostingStyle;
/** /**

View file

@ -44,7 +44,7 @@ extern "C" {
* deserialisation of a property list. * deserialisation of a property list.
*/ */
typedef enum { typedef enum {
NSPropertyListImmutable, NSPropertyListImmutable = 0,
/** <strong>NSPropertyListImmutable</strong> /** <strong>NSPropertyListImmutable</strong>
* all objects in created list are immutable * all objects in created list are immutable
*/ */
@ -62,19 +62,22 @@ typedef enum {
* Specifies the serialisation format for a serialised property list. * Specifies the serialisation format for a serialised property list.
*/ */
typedef enum { typedef enum {
NSPropertyListGNUstepFormat, NSPropertyListOpenStepFormat = 1,
/** <strong>NSPropertyListOpenStepFormat</strong>
* the most human-readable format */
NSPropertyListXMLFormat_v1_0 = 100,
/** <strong>NSPropertyListXMLFormat_v1_0</strong>
* portable and readable */
NSPropertyListBinaryFormat_v1_0 = 200,
/** <strong>NSPropertyListBinaryFormat_v1_0</strong>
* the standard format on macos-x */
NSPropertyListGNUstepFormat = 1000,
/** <strong>NSPropertyListGNUstepFormat</strong> /** <strong>NSPropertyListGNUstepFormat</strong>
* extension of OpenStep format */ * extension of OpenStep format */
NSPropertyListGNUstepBinaryFormat, NSPropertyListGNUstepBinaryFormat,
/** <strong>NSPropertyListGNUstepBinaryFormat</strong> /** <strong>NSPropertyListGNUstepBinaryFormat</strong>
* efficient, hardware independent */ * efficient, hardware independent */
NSPropertyListOpenStepFormat,
/** <strong>NSPropertyListOpenStepFormat</strong>
* the most human-readable format */
NSPropertyListXMLFormat_v1_0,
/** <strong>NSPropertyListXMLFormat_v1_0</strong>
* portable and readable */
NSPropertyListBinaryFormat_v1_0,
} NSPropertyListFormat; } NSPropertyListFormat;
/** /**

View file

@ -53,7 +53,8 @@ enum
NSCaseInsensitiveSearch = 1, NSCaseInsensitiveSearch = 1,
NSLiteralSearch = 2, NSLiteralSearch = 2,
NSBackwardsSearch = 4, NSBackwardsSearch = 4,
NSAnchoredSearch = 8 NSAnchoredSearch = 8,
NSNumericSearch = 64 /* MacOS-X 10.2 */
}; };
/** /**