From a3c26d44e4db2ef3a34f7f77d28924708be14de3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 2 Jan 2013 18:22:07 +1100 Subject: [PATCH] AP_HAL: rename Sempahore.h to Semaphores.h this is needed to allow build on MacOS, as its case-insensitive filesystem picks up the NuttX semaphore.h --- libraries/AP_HAL/AP_HAL.h | 2 +- libraries/AP_HAL/{Semaphore.h => Semaphores.h} | 0 libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp | 2 +- libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp | 2 +- libraries/AP_HAL_AVR/SPIDriver.h | 2 +- libraries/AP_HAL_AVR/Semaphore.cpp | 2 +- libraries/AP_HAL_AVR/{Semaphore.h => Semaphores.h} | 0 libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h | 2 +- libraries/AP_HAL_Empty/SPIDriver.h | 2 +- libraries/AP_HAL_Empty/Semaphore.cpp | 2 +- libraries/AP_HAL_Empty/{Semaphore.h => Semaphores.h} | 0 11 files changed, 8 insertions(+), 8 deletions(-) rename libraries/AP_HAL/{Semaphore.h => Semaphores.h} (100%) rename libraries/AP_HAL_AVR/{Semaphore.h => Semaphores.h} (100%) rename libraries/AP_HAL_Empty/{Semaphore.h => Semaphores.h} (100%) diff --git a/libraries/AP_HAL/AP_HAL.h b/libraries/AP_HAL/AP_HAL.h index 69421159e3..023cf19421 100644 --- a/libraries/AP_HAL/AP_HAL.h +++ b/libraries/AP_HAL/AP_HAL.h @@ -19,7 +19,7 @@ #include "RCInput.h" #include "RCOutput.h" #include "Scheduler.h" -#include "Semaphore.h" +#include "Semaphores.h" #include "Util.h" #include "utility/Print.h" diff --git a/libraries/AP_HAL/Semaphore.h b/libraries/AP_HAL/Semaphores.h similarity index 100% rename from libraries/AP_HAL/Semaphore.h rename to libraries/AP_HAL/Semaphores.h diff --git a/libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp b/libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp index 6e84a5e295..9d2a966396 100644 --- a/libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp +++ b/libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp @@ -6,7 +6,7 @@ #include #include "SPIDevices.h" #include "GPIO.h" -#include "Semaphore.h" +#include "Semaphores.h" #include "pins_arduino_mega.h" using namespace AP_HAL_AVR; diff --git a/libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp b/libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp index d8a5e5aaea..0c8c0c89e1 100644 --- a/libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp +++ b/libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp @@ -6,7 +6,7 @@ #include #include "SPIDevices.h" #include "GPIO.h" -#include "Semaphore.h" +#include "Semaphores.h" #include "pins_arduino_mega.h" using namespace AP_HAL_AVR; diff --git a/libraries/AP_HAL_AVR/SPIDriver.h b/libraries/AP_HAL_AVR/SPIDriver.h index 3a13f27aba..abe5825290 100644 --- a/libraries/AP_HAL_AVR/SPIDriver.h +++ b/libraries/AP_HAL_AVR/SPIDriver.h @@ -6,7 +6,7 @@ #include "AP_HAL_AVR_Namespace.h" #include "GPIO.h" #include "SPIDevices.h" -#include "Semaphore.h" +#include "Semaphores.h" class AP_HAL_AVR::APM1SPIDeviceManager : public AP_HAL::SPIDeviceManager { public: diff --git a/libraries/AP_HAL_AVR/Semaphore.cpp b/libraries/AP_HAL_AVR/Semaphore.cpp index fe46b61c71..72497ab976 100644 --- a/libraries/AP_HAL_AVR/Semaphore.cpp +++ b/libraries/AP_HAL_AVR/Semaphore.cpp @@ -2,7 +2,7 @@ #include #include -#include "Semaphore.h" +#include "Semaphores.h" using namespace AP_HAL_AVR; extern const AP_HAL::HAL& hal; diff --git a/libraries/AP_HAL_AVR/Semaphore.h b/libraries/AP_HAL_AVR/Semaphores.h similarity index 100% rename from libraries/AP_HAL_AVR/Semaphore.h rename to libraries/AP_HAL_AVR/Semaphores.h diff --git a/libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h b/libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h index 9f6283346e..87a9bfdb7d 100644 --- a/libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h +++ b/libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h @@ -15,7 +15,7 @@ #include "GPIO.h" #include "RCInput.h" #include "RCOutput.h" -#include "Semaphore.h" +#include "Semaphores.h" #include "Scheduler.h" #include "Util.h" #include "PrivateMember.h" diff --git a/libraries/AP_HAL_Empty/SPIDriver.h b/libraries/AP_HAL_Empty/SPIDriver.h index c0315ca425..ac87320fdf 100644 --- a/libraries/AP_HAL_Empty/SPIDriver.h +++ b/libraries/AP_HAL_Empty/SPIDriver.h @@ -3,7 +3,7 @@ #define __AP_HAL_EMPTY_SPIDRIVER_H__ #include -#include "Semaphore.h" +#include "Semaphores.h" class Empty::EmptySPIDeviceDriver : public AP_HAL::SPIDeviceDriver { public: diff --git a/libraries/AP_HAL_Empty/Semaphore.cpp b/libraries/AP_HAL_Empty/Semaphore.cpp index 010413933c..9e7f38a474 100644 --- a/libraries/AP_HAL_Empty/Semaphore.cpp +++ b/libraries/AP_HAL_Empty/Semaphore.cpp @@ -1,5 +1,5 @@ -#include "Semaphore.h" +#include "Semaphores.h" using namespace Empty; diff --git a/libraries/AP_HAL_Empty/Semaphore.h b/libraries/AP_HAL_Empty/Semaphores.h similarity index 100% rename from libraries/AP_HAL_Empty/Semaphore.h rename to libraries/AP_HAL_Empty/Semaphores.h