An Overlay-based
Virtual Network Substrate
SpoVNet

Ignore:
Timestamp:
Aug 22, 2012, 2:09:00 PM (6 years ago)
Author:
s_taenzer@…
Message:

Merge CMake branch into trunk

Location:
source
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • source

    • Property svn:ignore deleted
  • source/ariba

    • Property svn:ignore deleted
  • source/ariba/communication

    • Property svn:ignore deleted
  • source/ariba/communication/networkinfo

    • Property svn:ignore deleted
  • source/ariba/communication/networkinfo/AddressDiscovery.cpp

    r10653 r10700  
    4949#include <ifaddrs.h>
    5050
    51 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     51#ifdef HAVE_LIBBLUETOOTH
    5252  #include <bluetooth/bluetooth.h>
    5353  #include <bluetooth/hci.h>
     
    6060mac_address AddressDiscovery::getMacFromIF( const char* name ) {
    6161        mac_address addr;
    62 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     62#ifdef HAVE_LIBBLUETOOTH
    6363        int s;
    6464        struct ifreq buffer;
     
    7474
    7575int AddressDiscovery::dev_info(int s, int dev_id, long arg) {
    76 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     76#ifdef HAVE_LIBBLUETOOTH
    7777        endpoint_set* set = (endpoint_set*)arg;
    7878        struct hci_dev_info di;
     
    8989
    9090void AddressDiscovery::discover_bluetooth( endpoint_set& endpoints ) {
    91 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     91#ifdef HAVE_LIBBLUETOOTH
    9292        hci_for_each_dev(HCI_UP, &AddressDiscovery::dev_info, (long)&endpoints );
    9393#endif
  • source/ariba/communication/networkinfo/NetworkInformation.cpp

    r5860 r10700  
    4040#include "ariba/config.h"
    4141
    42 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     42#ifdef HAVE_LIBBLUETOOTH
    4343  #include <bluetooth/bluetooth.h>
    4444  #include <bluetooth/hci.h>
     
    211211        //
    212212
    213 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     213#ifdef HAVE_LIBBLUETOOTH
    214214
    215215        int btsock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI);
Note: See TracChangeset for help on using the changeset viewer.