gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-24 01:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update fgor MacOS compatibility

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27099 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2008-11-20 00:11:22 +00:00
parent 9f7e2e9c66
commit 7181661442
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -1,6 +1,7 @@
2008-11-19 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSData.m: Fix bug #24883
* Headers/Foundation/NSRange.h: Update to use NSUInteger
2008-11-19 Richard Frith-Macdonald <rfm@gnu.org>

22
Headers/Foundation/NSRange.h
View file

@ -56,8 +56,8 @@ extern "C" {
/**
* <example>
{
unsigned int location;
unsigned int length;
NSUInteger location;
NSUInteger length;
}</example>
* <p>
* The NSRange type is used to specify ranges of locations,
@ -83,8 +83,8 @@ extern "C" {
typedef struct _NSRange NSRange;
struct _NSRange
{
unsigned int location;
unsigned int length;
NSUInteger location;
NSUInteger length;
};
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
@ -109,24 +109,24 @@ typedef NSRange *NSRangePointer;
#define GS_RANGE_ATTR __attribute__((unused))
#endif
GS_RANGE_SCOPE unsigned
GS_RANGE_SCOPE NSUInteger
NSMaxRange(NSRange range) GS_RANGE_ATTR;
/** Returns top end of range (location + length). */
GS_RANGE_SCOPE unsigned
GS_RANGE_SCOPE NSUInteger
NSMaxRange(NSRange range)
{
return range.location + range.length;
}
GS_RANGE_SCOPE BOOL
NSLocationInRange(unsigned location, NSRange range) GS_RANGE_ATTR;
NSLocationInRange(NSUInteger location, NSRange range) GS_RANGE_ATTR;
/** Returns whether location is greater than or equal to range's location
* and less than its max.
*/
GS_RANGE_SCOPE BOOL
NSLocationInRange(unsigned location, NSRange range)
NSLocationInRange(NSUInteger location, NSRange range)
{
return (location >= range.location) && (location < NSMaxRange(range));
}
@ -142,14 +142,14 @@ GS_EXPORT void _NSRangeExceptionRaise (void);
implementation of the base classes themselves. */
GS_RANGE_SCOPE NSRange
NSMakeRange(unsigned int location, unsigned int length) GS_RANGE_ATTR;
NSMakeRange(NSUInteger location, NSUInteger length) GS_RANGE_ATTR;
/** Creates new range starting at location and of given length. */
GS_RANGE_SCOPE NSRange
NSMakeRange(unsigned int location, unsigned int length)
NSMakeRange(NSUInteger location, NSUInteger length)
{
NSRange range;
unsigned int end = location + length;
NSUInteger end = location + length;
if (end < location || end < length)
{