Fix a few apple incompatibilities

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23219 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-08-08 17:05:55 +00:00
parent 53020cec58
commit 97c0b7bf3f
2 changed files with 9 additions and 13 deletions

View file

@ -290,14 +290,6 @@ typedef enum {
@end
@protocol GSStreamListener
/**
* The delegate receives this message when streamEvent
* has occurred on theStream.
*/
- (void) stream: (NSStream *)theStream handleEvent: (NSStreamEvent)streamEvent;
@end
GS_EXPORT NSString * const NSStreamDataWrittenToMemoryStreamKey;
GS_EXPORT NSString * const NSStreamFileCurrentOffsetKey;
@ -318,6 +310,12 @@ GS_EXPORT NSString * const NSStreamSOCKSProxyVersion4;
GS_EXPORT NSString * const NSStreamSOCKSProxyVersion5;
GS_EXPORT NSString * const NSStreamSOCKSProxyVersionKey;
/**
* Informal protocol for delegates of instance of the [NSStream] class.
*/
@interface NSObject (NSStreamDelegate)
- (void) stream: (NSStream*)sStream handleEvent: (NSStreamEvent)anEvent;
@end
#endif

View file

@ -370,7 +370,7 @@ static RunLoopEventType typeForStream(NSStream *aStream)
}
if (_delegateValid == YES)
{
[(id <GSStreamListener>)_delegate stream: self handleEvent: event];
[_delegate stream: self handleEvent: event];
}
while ((current = [self streamStatus]) != last)
@ -385,8 +385,7 @@ static RunLoopEventType typeForStream(NSStream *aStream)
if (_delegateValid == YES)
{
event = NSStreamEventEndEncountered;
[(id <GSStreamListener>)_delegate stream: self
handleEvent: event];
[_delegate stream: self handleEvent: event];
}
}
else if (current == NSStreamStatusError)
@ -394,8 +393,7 @@ static RunLoopEventType typeForStream(NSStream *aStream)
if (_delegateValid == YES)
{
event = NSStreamEventErrorOccurred;
[(id <GSStreamListener>)_delegate stream: self
handleEvent: event];
[_delegate stream: self handleEvent: event];
}
}
else