Changeset 10700 for source/ariba/utility/transport/rfcomm

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/transport (modified) (1 prop)
• ariba/utility/transport/rfcomm/CMakeLists.txt (added)
• ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp (modified) (1 diff)
• ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp (modified) (2 diffs)

source/ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp

@@ -192 +192 @@
 }}} // namespace boost::asio::bluetooth
 
+#endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */
 #endif /* HAVE_LIBBLUETOOTH */
-#endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */

source/ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp

@@ +1 @@
+#include "ariba/config.h"
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #ifndef BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
 #define BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
@@ -53 +57 @@
 
 #endif /* BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__ */
+#endif /* HAVE_LIBBLUETOOTH */