From 77c236a6b78f8588cdf867aab15c587d81cbe494 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Sat, 15 Aug 2015 19:50:47 -0300 Subject: [PATCH] AP_HAL_Linux: standardize inclusion of libaries headers Do the missing header changes due to changing the code before the pr getting accepted. --- libraries/AP_HAL_Linux/ConsoleDevice.h | 2 +- libraries/AP_HAL_Linux/SPIUARTDriver.cpp | 2 +- libraries/AP_HAL_Linux/TCPServerDevice.h | 2 +- libraries/AP_HAL_Linux/UARTDevice.h | 2 +- libraries/AP_HAL_Linux/UARTDriver.cpp | 2 +- libraries/AP_HAL_Linux/UDPDevice.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/AP_HAL_Linux/ConsoleDevice.h b/libraries/AP_HAL_Linux/ConsoleDevice.h index d34742052f..88c4e3a551 100644 --- a/libraries/AP_HAL_Linux/ConsoleDevice.h +++ b/libraries/AP_HAL_Linux/ConsoleDevice.h @@ -2,7 +2,7 @@ #define __AP_HAL_LINUX_CONSOLEDEVICE_UDP_H__ #include "SerialDevice.h" -#include "../AP_HAL/utility/Socket.h" +#include class ConsoleDevice: public SerialDevice { public: diff --git a/libraries/AP_HAL_Linux/SPIUARTDriver.cpp b/libraries/AP_HAL_Linux/SPIUARTDriver.cpp index 37492830d5..5fb4bb2953 100644 --- a/libraries/AP_HAL_Linux/SPIUARTDriver.cpp +++ b/libraries/AP_HAL_Linux/SPIUARTDriver.cpp @@ -5,7 +5,7 @@ #include #include #include "SPIUARTDriver.h" -#include "../AP_HAL/utility/RingBuffer.h" +#include extern const AP_HAL::HAL& hal; diff --git a/libraries/AP_HAL_Linux/TCPServerDevice.h b/libraries/AP_HAL_Linux/TCPServerDevice.h index 26bf555403..e42700abbd 100644 --- a/libraries/AP_HAL_Linux/TCPServerDevice.h +++ b/libraries/AP_HAL_Linux/TCPServerDevice.h @@ -2,7 +2,7 @@ #define __AP_HAL_LINUX_TCPCLIENTDEVICE_H__ #include "SerialDevice.h" -#include "../AP_HAL/utility/Socket.h" +#include class TCPServerDevice: public SerialDevice { public: diff --git a/libraries/AP_HAL_Linux/UARTDevice.h b/libraries/AP_HAL_Linux/UARTDevice.h index bb6f9a7d66..f6fc4a66af 100644 --- a/libraries/AP_HAL_Linux/UARTDevice.h +++ b/libraries/AP_HAL_Linux/UARTDevice.h @@ -2,7 +2,7 @@ #define __AP_HAL_LINUX_UARTDEVICE_UDP_H__ #include "SerialDevice.h" -#include "../AP_HAL/utility/Socket.h" +#include class UARTDevice: public SerialDevice { public: diff --git a/libraries/AP_HAL_Linux/UARTDriver.cpp b/libraries/AP_HAL_Linux/UARTDriver.cpp index 7868806948..26dd5ee1cd 100644 --- a/libraries/AP_HAL_Linux/UARTDriver.cpp +++ b/libraries/AP_HAL_Linux/UARTDriver.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "../AP_HAL/utility/RingBuffer.h" +#include #include "UARTDevice.h" #include "UDPDevice.h" diff --git a/libraries/AP_HAL_Linux/UDPDevice.h b/libraries/AP_HAL_Linux/UDPDevice.h index 368cd391cd..ac6928f26c 100644 --- a/libraries/AP_HAL_Linux/UDPDevice.h +++ b/libraries/AP_HAL_Linux/UDPDevice.h @@ -2,7 +2,7 @@ #define __AP_HAL_LINUX_UDPDEVICE_UDP_H__ #include "SerialDevice.h" -#include "../AP_HAL/utility/Socket.h" +#include class UDPDevice: public SerialDevice { public: