From davidm at astro.berkeley.edu  Tue May  4 14:38:22 2010
From: davidm at astro.berkeley.edu (David MacMahon)
Date: Tue,  4 May 2010 11:38:22 -0700
Subject: [dnssd-developers] [PATCH] Add ifdef around MAX_SERVICE_NAME
	definition
Message-ID: <1272998302-2341-1-git-send-email-davidm@astro.berkeley.edu>

On Tiger (Mac OS X 10.4.11), kDNSServiceMaxServiceName is not not
defined so the rb_define_const for MAX_SERVICE_NAME would fail to
compile.  This surrounds the definition of MAX_SERVICE_NAME with an
ifdef so that it will not be defined on platforms that do not have it
defined.

An alternative would be to give MAX_SERVICE_NAME the value of
kDNSServiceMaxDomainName, but that seemed a little sketchy to me. I
chose this path after noting that MAX_SERVICE_NAME and
kDNSServiceMaxServiceName are used nowhere else in the extension code or
sample code.
---
 ext/dnssd/service.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ext/dnssd/service.c b/ext/dnssd/service.c
index 6c18fc6..73c443a 100644
--- a/ext/dnssd/service.c
+++ b/ext/dnssd/service.c
@@ -658,9 +658,11 @@ Init_DNSSD_Service(void) {
   rb_define_const(cDNSSDService, "MAX_DOMAIN_NAME",
       ULONG2NUM(kDNSServiceMaxDomainName));
 
+#ifdef kDNSServiceMaxServiceName
   /* Maximum length for a service name */
   rb_define_const(cDNSSDService, "MAX_SERVICE_NAME",
       ULONG2NUM(kDNSServiceMaxServiceName));
+#endif
 
 #ifdef kDNSServiceProperty_DaemonVersion
   /* DaemonVersion property value */
-- 
1.7.0.4


From davidm at astro.berkeley.edu  Tue May  4 16:29:36 2010
From: davidm at astro.berkeley.edu (David MacMahon)
Date: Tue,  4 May 2010 13:29:36 -0700
Subject: [dnssd-developers] [PATCH] Add 'ext' to require_paths in gem spec
Message-ID: <1273004976-3917-1-git-send-email-davidm@astro.berkeley.edu>

This allows the extension to load since lib/dnssd.rb does...

  require 'dnssd/dnssd'

...to load ext/dnssd/dnssd.{so,bundle,dll}.  How could this have ever
worked before?
---
 Rakefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Rakefile b/Rakefile
index deb5378..96294b2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -18,6 +18,7 @@ HOE = Hoe.spec 'dnssd' do
   developer 'Rich Kilmer',     ''
 
   spec_extras[:extensions] = 'ext/dnssd/extconf.rb'
+  spec_extras[:require_paths] = ['lib', 'ext']
 
   clean_globs << 'lib/dnssd/*.{so,bundle,dll}'
 
-- 
1.7.0.4