From 5130133dbf3c84dc6214417ca0e298b8b46fbb42 Mon Sep 17 00:00:00 2001 From: rfm Date: Wed, 18 Mar 2009 10:02:49 +0000 Subject: [PATCH] OSX 10.5 API fixups for mingw git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28092 72102866-910b-0410-8b05-ffd578937521 --- Source/NSArray.m | 2 +- Source/NSFileManager.m | 6 +++--- Source/NSPathUtilities.m | 2 +- Source/NSPortCoder.m | 2 +- Source/win32/GSFileHandle.m | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/NSArray.m b/Source/NSArray.m index f92dd427a..620ff60e3 100644 --- a/Source/NSArray.m +++ b/Source/NSArray.m @@ -1355,7 +1355,7 @@ compare(id elem1, id elem2, void* context) - (id) valueForKeyPath: (NSString*)path { - id result = nil; + id result = nil; if ([path hasPrefix: @"@"]) { diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m index ded208aab..e97d085ec 100644 --- a/Source/NSFileManager.m +++ b/Source/NSFileManager.m @@ -3086,7 +3086,7 @@ static NSSet *fileKeys = nil; return [NSDate dateWithTimeIntervalSince1970: statbuf.st_mtime]; } -- (unsigned long) filePosixPermissions +- (NSUInteger) filePosixPermissions { return (statbuf.st_mode & ~S_IFMT); } @@ -3223,12 +3223,12 @@ static NSSet *fileKeys = nil; return statbuf.st_size; } -- (unsigned long) fileSystemFileNumber +- (NSUInteger) fileSystemFileNumber { return statbuf.st_ino; } -- (unsigned long) fileSystemNumber +- (NSUInteger) fileSystemNumber { return statbuf.st_dev; } diff --git a/Source/NSPathUtilities.m b/Source/NSPathUtilities.m index fdd0180f7..210548bd0 100644 --- a/Source/NSPathUtilities.m +++ b/Source/NSPathUtilities.m @@ -1034,7 +1034,7 @@ ParseConfigurationFile(NSString *fileName, NSMutableDictionary *dict, fprintf(stderr, "The file '%S' is writable by someone other than" " its owner (permissions 0%lo).\nIgnoring it.\n", [fileName fileSystemRepresentation], - [attributes filePosixPermissions]); + (long)[attributes filePosixPermissions]); #else fprintf(stderr, "The file '%s' is writable by someone other than" " its owner (permissions 0%lo).\nIgnoring it.\n", diff --git a/Source/NSPortCoder.m b/Source/NSPortCoder.m index 6eef89dcf..d7bf85954 100644 --- a/Source/NSPortCoder.m +++ b/Source/NSPortCoder.m @@ -1914,7 +1914,7 @@ static IMP _xRefImp; /* Serialize a crossref. */ return _version; } -- (unsigned) versionForClassName: (NSString*)className +- (NSInteger) versionForClassName: (NSString*)className { GSClassInfo *info = nil; unsigned version = NSNotFound; diff --git a/Source/win32/GSFileHandle.m b/Source/win32/GSFileHandle.m index 17a4486a6..3fb9da1a8 100644 --- a/Source/win32/GSFileHandle.m +++ b/Source/win32/GSFileHandle.m @@ -93,7 +93,7 @@ static NSString* NotificationKey = @"NSFileHandleNotificationKey"; * Encapsulates low level read operation to get data from the operating * system. */ -- (int) read: (void*)buf length: (int)len +- (NSInteger) read: (void*)buf length: (NSUInteger)len { #if USE_ZLIB if (gzDescriptor != 0) @@ -133,7 +133,7 @@ static NSString* NotificationKey = @"NSFileHandleNotificationKey"; * Encapsulates low level write operation to send data to the operating * system. */ -- (int) write: (const void*)buf length: (int)len +- (NSInteger) write: (const void*)buf length: (NSUInteger)len { #if USE_ZLIB if (gzDescriptor != 0)