From 29a2351fd027e83b17ea8184549c45be5fa0c3a2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Thu, 31 Oct 2019 21:58:27 +1100
Subject: [PATCH] AP_HAL: rename AP_HAL::CAN to AP_HAL::CANHal

avoid conflict with ChibiOS STM32F3xx headers
---
 libraries/AP_HAL/AP_HAL_Namespace.h | 2 +-
 libraries/AP_HAL/CAN.h              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/AP_HAL/AP_HAL_Namespace.h b/libraries/AP_HAL/AP_HAL_Namespace.h
index e3bbd21167..5633d3c902 100644
--- a/libraries/AP_HAL/AP_HAL_Namespace.h
+++ b/libraries/AP_HAL/AP_HAL_Namespace.h
@@ -31,7 +31,7 @@ namespace AP_HAL {
 
     class CANProtocol;
     class CANManager;
-    class CAN;
+    class CANHal;
 
     class Util;
     class Flash;
diff --git a/libraries/AP_HAL/CAN.h b/libraries/AP_HAL/CAN.h
index 667c823312..f9c7fc855e 100644
--- a/libraries/AP_HAL/CAN.h
+++ b/libraries/AP_HAL/CAN.h
@@ -48,7 +48,7 @@ public:
 /**
  * Single non-blocking CAN interface.
  */
-class AP_HAL::CAN: public uavcan::ICanIface {
+class AP_HAL::CANHal: public uavcan::ICanIface {
 public:
     /*  CAN port open method