diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-17 18:58:56 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-17 18:58:56 +0000 |
| commit | 1106b00e75e37e7f25a28ee95da560de55520018 (patch) | |
| tree | 3cf4bf7fe0423f2425a401d1c76a5b62ce533f3c /scheduler/dirsvc.c | |
| parent | 10d09e334a4892cd5ed4e2a2a0f5bbe3c8c171ed (diff) | |
| download | cups-1106b00e75e37e7f25a28ee95da560de55520018.tar.gz | |
Merge changes from CUPS 1.5svn-r9374.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2859 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/dirsvc.c')
| -rw-r--r-- | scheduler/dirsvc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 2f7f0e6c4..300fa6976 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -1915,13 +1915,13 @@ cupsdUpdateDNSSDName(void) { DNSServiceErrorType error; /* Error from service creation */ char webif[1024]; /* Web interface share name */ -#ifdef HAVE_COREFOUNDATION_H +# ifdef HAVE_SYSTEMCONFIGURATION SCDynamicStoreRef sc; /* Context for dynamic store */ CFDictionaryRef btmm; /* Back-to-My-Mac domains */ CFStringEncoding nameEncoding; /* Encoding of computer name */ CFStringRef nameRef; /* Host name CFString */ char nameBuffer[1024]; /* C-string buffer */ -#endif /* HAVE_COREFOUNDATION_H */ +# endif /* HAVE_SYSTEMCONFIGURATION */ /* @@ -1937,7 +1937,7 @@ cupsdUpdateDNSSDName(void) * Get the computer name as a c-string... */ -#ifdef HAVE_COREFOUNDATION_H +# ifdef HAVE_SYSTEMCONFIGURATION sc = SCDynamicStoreCreate(kCFAllocatorDefault, CFSTR("cupsd"), NULL, NULL); if (sc) @@ -2028,7 +2028,7 @@ cupsdUpdateDNSSDName(void) CFRelease(sc); } else -#endif /* HAVE_COREFOUNDATION_H */ +# endif /* HAVE_SYSTEMCONFIGURATION */ { cupsdSetString(&DNSSDComputerName, ServerName); cupsdSetString(&DNSSDHostName, ServerName); |