From 486cbb78909ed03e65d090e0b092bb5892d62554 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 14 Jul 2023 10:58:06 +1000
Subject: [PATCH] AP_Logger: allow compilation with HAL_LOGGING_ENABLED false

---
 libraries/AP_Logger/AP_Logger.h                      | 12 ++++++++++++
 libraries/AP_Logger/AP_Logger_MAVLinkLogTransfer.cpp |  8 +++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/libraries/AP_Logger/AP_Logger.h b/libraries/AP_Logger/AP_Logger.h
index cf6d232f85..cab112ea65 100644
--- a/libraries/AP_Logger/AP_Logger.h
+++ b/libraries/AP_Logger/AP_Logger.h
@@ -5,6 +5,8 @@
 
 #include "AP_Logger_config.h"
 
+#if HAL_LOGGING_ENABLED
+
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Common/AP_Common.h>
 #include <AP_Param/AP_Param.h>
@@ -609,3 +611,13 @@ private:
 namespace AP {
     AP_Logger &logger();
 };
+
+#define LOGGER_WRITE_ERROR(subsys, err) AP::logger().Write_Error(subsys, err)
+#define LOGGER_WRITE_EVENT(evt) AP::logger().Write_Event(evt)
+
+#else
+
+#define LOGGER_WRITE_ERROR(subsys, err)
+#define LOGGER_WRITE_EVENT(evt)
+
+#endif  // HAL_LOGGING_ENABLED
diff --git a/libraries/AP_Logger/AP_Logger_MAVLinkLogTransfer.cpp b/libraries/AP_Logger/AP_Logger_MAVLinkLogTransfer.cpp
index 3403d5f059..08486b60e9 100644
--- a/libraries/AP_Logger/AP_Logger_MAVLinkLogTransfer.cpp
+++ b/libraries/AP_Logger/AP_Logger_MAVLinkLogTransfer.cpp
@@ -17,13 +17,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <GCS_MAVLink/GCS_config.h>
+#include <AP_Logger/AP_Logger_config.h>
+
+#if HAL_LOGGING_ENABLED && HAL_GCS_ENABLED
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Logger/AP_Logger.h>
 #include <GCS_MAVLink/GCS.h> // for LOG_ENTRY
 
-#if HAL_GCS_ENABLED
-
 extern const AP_HAL::HAL& hal;
 
 /**
@@ -327,4 +329,4 @@ bool AP_Logger::handle_log_send_data()
     return true;
 }
 
-#endif
+#endif  // HAL_LOGGING_ENABLED && HAL_GCS_ENABLED