Changeset 10700 for source/ariba/communication/networkinfo/NetworkInformation.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/communication (modified) (1 prop)
• ariba/communication/networkinfo (modified) (1 prop)
• ariba/communication/networkinfo/NetworkInformation.cpp (modified) (2 diffs)

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);