gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 08:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix enums

Browse source
This commit is contained in:
Matvii Jarosh 2024-11-19 18:45:39 +02:00
parent aa4a062692
commit 055cb708f9
2 changed files with 3 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Headers/Foundation/NSGeometry.h
View file

@ -97,17 +97,13 @@ typedef NSRect *NSRectArray;
typedef NSRect *NSRectPointer;
#endif
<<<<<<< HEAD
typedef NS_ENUM(NSUInteger, NSRectEdge)
=======
typedef enum
>>>>>>> e0b37c4a1b60bd93877d40d814ebb99944635478
{
NSMinXEdge = 0,
NSMinYEdge = 1,
NSMaxXEdge = 2,
NSMaxYEdge = 3
} NSRectEdge;
};
/** Sides of a rectangle.
<example>
{
@ -148,11 +144,7 @@ typedef enum
</example>
<p>NSAlignmentOptions</p>*/
#if OS_API_VERSION(MAC_OS_X_VERSION_10_7, GS_API_LATEST)
<<<<<<< HEAD
typedef NS_ENUM(unsigned long long, NSAlignmentOptions)
=======
typedef enum
>>>>>>> e0b37c4a1b60bd93877d40d814ebb99944635478
typedef NS_ENUM(unsigned long long, NSAlignmentOptions)
{
NSAlignMinXInward = 1ULL << 0,
NSAlignMinYInward = 1ULL << 1,
@ -185,11 +177,7 @@ typedef enum
| NSAlignMaxXNearest
| NSAlignMinYNearest
| NSAlignMaxYNearest
<<<<<<< HEAD
};
=======
} NSAlignmentOptions;
>>>>>>> e0b37c4a1b60bd93877d40d814ebb99944635478
#endif
/**