diff -r -u boost_1_38_0/boost/asio/serial_port_base.hpp boost_1_38_vxworks/boost/asio/serial_port_base.hpp
|
old
|
new
|
|
| 22 | 22 | #include <stdexcept> |
| 23 | 23 | #include <boost/config.hpp> |
| 24 | 24 | #include <boost/detail/workaround.hpp> |
| | 25 | |
| | 26 | #if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT) |
| | 27 | |
| 25 | 28 | #if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__) |
| 26 | 29 | # include <termios.h> |
| 27 | 30 | #endif |
| … |
… |
|
| 156 | 159 | |
| 157 | 160 | #include <boost/asio/detail/pop_options.hpp> |
| 158 | 161 | |
| | 162 | #endif // !BOOST_ASIO_DISABLE_SERIAL_PORT |
| | 163 | |
| 159 | 164 | #endif // BOOST_ASIO_SERIAL_PORT_BASE_HPP |
diff -r -u boost_1_38_0/boost/asio/serial_port_service.hpp boost_1_38_vxworks/boost/asio/serial_port_service.hpp
|
old
|
new
|
|
| 23 | 23 | #include <string> |
| 24 | 24 | #include <boost/asio/detail/pop_options.hpp> |
| 25 | 25 | |
| | 26 | #if !defined(BOOST_ASIO_DISABLE_SERIAL_PORT) |
| | 27 | |
| 26 | 28 | #include <boost/asio/error.hpp> |
| 27 | 29 | #include <boost/asio/io_service.hpp> |
| 28 | 30 | #include <boost/asio/detail/service_base.hpp> |
| … |
… |
|
| 219 | 221 | #endif // defined(BOOST_ASIO_HAS_SERIAL_PORT) |
| 220 | 222 | // || defined(GENERATING_DOCUMENTATION) |
| 221 | 223 | |
| | 224 | #endif // !defined(BOOST_ASIO_DISABLE_SERIAL_PORT) |
| | 225 | |
| 222 | 226 | #include <boost/asio/detail/pop_options.hpp> |
| 223 | 227 | |
| 224 | 228 | #endif // BOOST_ASIO_SERIAL_PORT_SERVICE_HPP |