diff --git a/libraries/AP_RTC/AP_RTC.cpp b/libraries/AP_RTC/AP_RTC.cpp index aa646cb9dd..809cf371fd 100644 --- a/libraries/AP_RTC/AP_RTC.cpp +++ b/libraries/AP_RTC/AP_RTC.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include extern const AP_HAL::HAL& hal; @@ -209,7 +209,7 @@ uint32_t AP_RTC::get_time_utc(int32_t hour, int32_t min, int32_t sec, int32_t ms /* mktime replacement from Samba */ -time_t AP_RTC::mktime(const struct tm *t) +time_t ap_mktime(const struct tm *t) { time_t epoch = 0; int n; diff --git a/libraries/AP_RTC/AP_RTC.h b/libraries/AP_RTC/AP_RTC.h index 984a409e41..39b76b7d91 100644 --- a/libraries/AP_RTC/AP_RTC.h +++ b/libraries/AP_RTC/AP_RTC.h @@ -44,9 +44,6 @@ public: uint32_t get_time_utc(int32_t hour, int32_t min, int32_t sec, int32_t ms); - // replacement for mktime() - static time_t mktime(const struct tm *t); - // get singleton instance static AP_RTC *get_singleton() { return _singleton;