Changeset 10700 for source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp

Timestamp:

Aug 22, 2012, 2:09:00 PM (12 years ago)

Author:

Michael Tänzer

Message:

Merge CMake branch into trunk

Location:

source

Files:

• . (modified) (1 prop)
• ariba (modified) (1 prop)
• ariba/utility (modified) (1 prop)
• ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp (modified) (8 diffs)

source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp

@@ -48 +48 @@
 MulticastDns::MulticastDns(BootstrapInformationCallback* _callback, string info)
         : BootstrapModule(_callback) {
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
         avahiclient = NULL;
         avahipoll = NULL;
         avahibrowser = NULL;
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
 }
 
@@ -67 +67 @@
 
 bool MulticastDns::isFunctional(){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
         return true;
   #else
@@ -75 +75 @@
 
 void MulticastDns::start(){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
 
         int error = 0;
@@ -119 +119 @@
         avahi_threaded_poll_start( avahipoll );
 
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
 }
 
 void MulticastDns::stop(){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
 
         //
@@ -155 +155 @@
         avahipoll = NULL;
 
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
 }
 
 void MulticastDns::publishService(string name, string info1, string info2, string info3){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
 
         if(name.length() > 63){
@@ -234 +234 @@
         avahi_threaded_poll_unlock(avahipoll);
 
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
 }
 
 void MulticastDns::revokeService(string name){
-  #ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #ifdef HAVE_AVAHI
 
         avahi_threaded_poll_lock(avahipoll);
@@ -254 +254 @@
         avahi_threaded_poll_unlock(avahipoll);
 
-  #endif // HAVE_AVAHI_CLIENT_CLIENT_H
-}
-
-#ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+  #endif // HAVE_AVAHI
+}
+
+#ifdef HAVE_AVAHI
 
 void MulticastDns::client_callback(AvahiClient* client, AvahiClientState state, void* userdata){
@@ -440 +440 @@
 }
 
-#endif // HAVE_AVAHI_CLIENT_CLIENT_H
+#endif // HAVE_AVAHI
 
 }} //namespace ariba, utility