Changeset 10700 for source/ariba/communication

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/communication (modified) (1 prop)
• ariba/communication/CMakeLists.txt (added)
• ariba/communication/messages (modified) (1 prop)
• ariba/communication/messages/CMakeLists.txt (added)
• ariba/communication/networkinfo (modified) (1 prop)
• ariba/communication/networkinfo/AddressDiscovery.cpp (modified) (4 diffs)
• ariba/communication/networkinfo/CMakeLists.txt (added)
• ariba/communication/networkinfo/NetworkInformation.cpp (modified) (2 diffs)

source/ariba/communication/networkinfo/AddressDiscovery.cpp

@@ -49 +49 @@
 #include <ifaddrs.h>
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
   #include <bluetooth/bluetooth.h>
   #include <bluetooth/hci.h>
@@ -60 +60 @@
 mac_address AddressDiscovery::getMacFromIF( const char* name ) {
         mac_address addr;
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
         int s;
         struct ifreq buffer;
@@ -74 +74 @@
 
 int AddressDiscovery::dev_info(int s, int dev_id, long arg) {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
         endpoint_set* set = (endpoint_set*)arg;
         struct hci_dev_info di;
@@ -89 +89 @@
 
 void AddressDiscovery::discover_bluetooth( endpoint_set& endpoints ) {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
         hci_for_each_dev(HCI_UP, &AddressDiscovery::dev_info, (long)&endpoints );
 #endif

source/ariba/communication/networkinfo/NetworkInformation.cpp

@@ -40 +40 @@
 #include "ariba/config.h"
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
   #include <bluetooth/bluetooth.h>
   #include <bluetooth/hci.h>
@@ -211 +211 @@
         //
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
         int btsock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);