From c588d232cb97904400b048db923ee86e5bf9abcc Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 6 Aug 2021 06:53:38 +0100 Subject: [PATCH] Avoid name conflicts with usb_hid Arduino code (#13870) * Avoid name conflicts with usb_hid Arduino code * Fix tests --- quantum/quantum.h | 2 +- .../arm_atsam/{platform.h => platform_deps.h} | 0 .../common/avr/{platform.h => platform_deps.h} | 0 .../chibios/{platform.h => platform_deps.h} | 0 tmk_core/common/test/platform_deps.h | 18 ++++++++++++++++++ 5 files changed, 19 insertions(+), 1 deletion(-) rename tmk_core/common/arm_atsam/{platform.h => platform_deps.h} (100%) rename tmk_core/common/avr/{platform.h => platform_deps.h} (100%) rename tmk_core/common/chibios/{platform.h => platform_deps.h} (100%) create mode 100644 tmk_core/common/test/platform_deps.h diff --git a/quantum/quantum.h b/quantum/quantum.h index 55f6dbb7da5..d87d14041db 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -15,7 +15,7 @@ */ #pragma once -#include "platform.h" +#include "platform_deps.h" #include "wait.h" #include "matrix.h" #include "keymap.h" diff --git a/tmk_core/common/arm_atsam/platform.h b/tmk_core/common/arm_atsam/platform_deps.h similarity index 100% rename from tmk_core/common/arm_atsam/platform.h rename to tmk_core/common/arm_atsam/platform_deps.h diff --git a/tmk_core/common/avr/platform.h b/tmk_core/common/avr/platform_deps.h similarity index 100% rename from tmk_core/common/avr/platform.h rename to tmk_core/common/avr/platform_deps.h diff --git a/tmk_core/common/chibios/platform.h b/tmk_core/common/chibios/platform_deps.h similarity index 100% rename from tmk_core/common/chibios/platform.h rename to tmk_core/common/chibios/platform_deps.h diff --git a/tmk_core/common/test/platform_deps.h b/tmk_core/common/test/platform_deps.h new file mode 100644 index 00000000000..f296d1d535e --- /dev/null +++ b/tmk_core/common/test/platform_deps.h @@ -0,0 +1,18 @@ +/* Copyright 2021 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once + +// here just to please the build