tweaks to compile with mdns again

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36104 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-02-10 10:52:44 +00:00
parent e3497b7121
commit c83facd84d
3 changed files with 32 additions and 19 deletions

View file

@ -1,7 +1,7 @@
2013-02-10 Marcus Muller <znek@mulle-kybernetik.com>
* Source/GSMDNSNetServices.msh whether a delegate is set or not.
:
* Source/GSMDNSNetServices.m: enable whether a delegate is set or not.
2013-02-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSURL.m: For OSX compatibility, if we are creating a relative

View file

@ -794,7 +794,7 @@ static void DNSSD_API
Browser *browser;
browser = malloc(sizeof (struct _Browser));
memset(browser, 0, sizeof browser);
memset(browser, 0, sizeof &browser);
CREATELOCK(browser);
@ -1736,7 +1736,7 @@ static void DNSSD_API
Service *service;
service = malloc(sizeof (struct _Service));
memset(service, 0, sizeof service);
memset(service, 0, sizeof &service);
CREATELOCK(service);
@ -2473,7 +2473,7 @@ static void DNSSD_API
Monitor *monitor;
monitor = malloc(sizeof (struct _Monitor));
memset(monitor, 0, sizeof monitor);
memset(monitor, 0, sizeof &monitor);
CREATELOCK(monitor);

View file

@ -28,20 +28,7 @@
#import "Foundation/NSNetServices.h"
#import "GNUstepBase/NSNetServices+GNUstepBase.h"
// Subclasses using mDNSResponder:
/**
* NSNetService using the mDNSResponder API.
*/
@interface GSMDNSNetService : NSNetService
@end
/**
* NSNetServiceBrowser using the mDNSResponder API.
*/
@interface GSMDNSNetServiceBrowser : NSNetServiceBrowser
@end
#if GS_USE_AVAHI==1
// Subclasses using Avahi:
@ -139,3 +126,29 @@ NSString* GSNetServiceDotTerminatedNSStringFromString(const char* string);
NSMutableDictionary *_services;
}
@end
#else // GS_USE_MDNS
// Subclasses using mDNSResponder:
/**
* NSNetService using the mDNSResponder API.
*/
#ifdef __clang__
@interface GSMDNSNetService : NSNetService <NSNetServiceDelegate>
#else
@interface GSMDNSNetService : NSNetService
#endif
@end
/**
* NSNetServiceBrowser using the mDNSResponder API.
*/
#ifdef __clang__
@interface GSMDNSNetServiceBrowser : NSNetServiceBrowser <NSNetServiceBrowserDelegate>
#else
@interface GSMDNSNetServiceBrowser : NSNetServiceBrowser
#endif
@end
#endif // GS_USE_AVAHI