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

Timestamp:

Aug 22, 2012, 2:09:00 PM (13 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.h (modified) (4 diffs)

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

@@ -42 +42 @@
 #include "ariba/config.h"
 
-#ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+#ifdef HAVE_AVAHI
   #include <avahi-client/client.h>
   #include <avahi-client/lookup.h>
@@ -51 +51 @@
   #include <avahi-common/error.h>
   #include <avahi-common/timeval.h>
-#endif // HAVE_AVAHI_CLIENT_CLIENT_H
+#endif // HAVE_AVAHI
 
 #include <iostream>
@@ -86 +86 @@
         static const string serviceType;
 
-#ifdef HAVE_AVAHI_CLIENT_CLIENT_H
+#ifdef HAVE_AVAHI
 
         AvahiClient*         avahiclient;
@@ -133 +133 @@
                         );
 
-#endif // HAVE_AVAHI_CLIENT_CLIENT_H
+#endif // HAVE_AVAHI
 
 };