Changeset 10700 for source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h

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/bluetoothsdp (modified) (1 prop)
• ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h (modified) (3 diffs)

source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h

@@ -54 +54 @@
 #include "ariba/utility/logging/Logging.h"
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
   #include <bluetooth/bluetooth.h>
   #include <bluetooth/sdp.h>
@@ -94 +94 @@
 private:
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
         void bt_scan();
         void sdp_search(bdaddr_t target, string devicename);
@@ -104 +104 @@
 
         bool haveConnections();
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 
         boost::asio::io_service io_service_;