An Overlay-based
Virtual Network Substrate
SpoVNet

Ignore:
Timestamp:
Aug 22, 2012, 2:09:00 PM (7 years ago)
Author:
Michael Tänzer
Message:

Merge CMake branch into trunk

Location:
source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • source

    • Property svn:ignore deleted
  • source/ariba

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

    • Property svn:ignore deleted
  • source/ariba/utility/bootstrap/modules/bluetoothsdp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h

    r7532 r10700  
    5454#include "ariba/utility/logging/Logging.h"
    5555
    56 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     56#ifdef HAVE_LIBBLUETOOTH
    5757  #include <bluetooth/bluetooth.h>
    5858  #include <bluetooth/sdp.h>
     
    9494private:
    9595
    96 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
     96#ifdef HAVE_LIBBLUETOOTH
    9797        void bt_scan();
    9898        void sdp_search(bdaddr_t target, string devicename);
     
    104104
    105105        bool haveConnections();
    106 #endif // HAVE_BLUETOOTH_BLUETOOTH_H
     106#endif // HAVE_LIBBLUETOOTH
    107107
    108108        boost::asio::io_service io_service_;
Note: See TracChangeset for help on using the changeset viewer.