diff --git a/ChangeLog b/ChangeLog index fbae55b6a..68f6676e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-02-03 Richard Frith-Macdonald + + * Source/GSNetServices.h: + * Source/GSMDNSNetServices.m: + * Headers/Foundation/NSNetServices.h: + Tweaks to get MDNS code to compile again. + 2011-02-02 Stefan Bidigaray * Source/NSDateFormatter.m: ([-doesRelativeDateFormatting]) diff --git a/Headers/Foundation/NSNetServices.h b/Headers/Foundation/NSNetServices.h index b8072811e..9e96e32c4 100644 --- a/Headers/Foundation/NSNetServices.h +++ b/Headers/Foundation/NSNetServices.h @@ -130,7 +130,6 @@ GS_EXPORT NSString * const NSNetServicesErrorDomain; @interface NSNetService : NSObject { #if GS_EXPOSE(NSNetService) - @private id _delegate; void *_netService; void *_reserved; @@ -222,7 +221,6 @@ GS_EXPORT NSString * const NSNetServicesErrorDomain; @interface NSNetServiceBrowser : NSObject { #if GS_EXPOSE(NSNetServiceBrowser) - @private id _delegate; void *_netServiceBrowser; void *_reserved; diff --git a/Source/GSMDNSNetServices.m b/Source/GSMDNSNetServices.m index cdff0fd73..aeb40a03a 100644 --- a/Source/GSMDNSNetServices.m +++ b/Source/GSMDNSNetServices.m @@ -24,7 +24,6 @@ #import "common.h" #import "GSNetServices.h" -#define EXPOSE_NSNetServices_IVARS 1 #import "Foundation/NSNetServices.h" #import "Foundation/NSDictionary.h" #import "Foundation/NSEnumerator.h" @@ -2296,14 +2295,13 @@ static void DNSSD_API - (void) netService: (NSNetService *) sender didUpdateTXTRecordData: (NSData *) data { - id _delegate = [self delegate]; + id delegate = [self delegate]; INTERNALTRACE; - if ([_delegate respondsToSelector: + if ([delegate respondsToSelector: @selector(netService:didUpdateTXTRecordData:)]) { - [_delegate netService: sender - didUpdateTXTRecordData: data]; + [delegate netService: sender didUpdateTXTRecordData: data]; } } diff --git a/Source/GSNetServices.h b/Source/GSNetServices.h index 811a19cf3..1b2012e1c 100644 --- a/Source/GSNetServices.h +++ b/Source/GSNetServices.h @@ -23,8 +23,8 @@ */ #import "common.h" -#define EXPOSE_NSNetServices_IVARS 1 -#define EXPOSE_NSNetServicesBrowser_IVARS 1 +#define EXPOSE_NSNetService_IVARS 1 +#define EXPOSE_NSNetServiceBrowser_IVARS 1 #import "Foundation/NSNetServices.h" // Subclasses using mDNSResponder: