CUPS did not compile without Avahi or mDNSResponder (STR #4523)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12270 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index 34da6f87260b1e6d6dea4298b97bdb30913860a8..6aa6895c828ae613089194421d9f4d427cf6fe88 100644 (file)
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -7,7 +7,8 @@ CHANGES IN CUPS V2.0.2
          (<rdar://problem/14546232>)
        - The scheduler incorrectly cleared the MakeModel string in the
          printers.conf file after a restart (<rdar://problem/16827518>)
-       - CUPS did not work with older versions of GNU TLS (STR #4527)
+       - CUPS did not compile with older versions of GNU TLS (STR #4527)
+       - CUPS did not compile without Avahi or mDNSResponder (STR #4523)
 
 
 CHANGES IN CUPS V2.0.1

diff --git a/test/ippserver.c b/test/ippserver.c
index 212758b9781744d932451e90bf6779be440b8db1..2a698304942217dda4b0ed0aa751fe26ee18bbc6 100644 (file)
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -419,12 +419,12 @@ static int                valid_job_attributes(_ipp_client_t *client);
  * Globals...
  */
 
-#  ifdef HAVE_DNSSD
+#ifdef HAVE_DNSSD
 static DNSServiceRef   DNSSDMaster = NULL;
-#  else /* HAVE_AVAHI */
+#elif defined(HAVE_AVAHI)
 static AvahiThreadedPoll *DNSSDMaster = NULL;
 static AvahiClient     *DNSSDClient = NULL;
-#  endif /* HAVE_DNSSD */
+#endif /* HAVE_DNSSD */
 
 static int             KeepFiles = 0,
                        Verbosity = 0;