diff options
author | Joel Challis <git@zvecr.com> | 2021-08-06 06:53:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-06 15:53:38 +1000 |
commit | c588d232cb97904400b048db923ee86e5bf9abcc (patch) | |
tree | e5895ef695c5a16fb3567f95e3ca64c75b9001e4 /tmk_core | |
parent | b9a1b61f6ac42bbd73123d86058ec8b7048d5da6 (diff) | |
download | qmk_firmware-c588d232cb97904400b048db923ee86e5bf9abcc.tar.gz qmk_firmware-c588d232cb97904400b048db923ee86e5bf9abcc.zip |
Avoid name conflicts with usb_hid Arduino code (#13870)
* Avoid name conflicts with usb_hid Arduino code
* Fix tests
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/common/arm_atsam/platform_deps.h (renamed from tmk_core/common/arm_atsam/platform.h) | 0 | ||||
-rw-r--r-- | tmk_core/common/avr/platform_deps.h (renamed from tmk_core/common/avr/platform.h) | 0 | ||||
-rw-r--r-- | tmk_core/common/chibios/platform_deps.h (renamed from tmk_core/common/chibios/platform.h) | 0 | ||||
-rw-r--r-- | tmk_core/common/test/platform_deps.h | 18 |
4 files changed, 18 insertions, 0 deletions
diff --git a/tmk_core/common/arm_atsam/platform.h b/tmk_core/common/arm_atsam/platform_deps.h index f296d1d53..f296d1d53 100644 --- a/tmk_core/common/arm_atsam/platform.h +++ b/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 index 45d9dcebf..45d9dcebf 100644 --- a/tmk_core/common/avr/platform.h +++ b/tmk_core/common/avr/platform_deps.h | |||
diff --git a/tmk_core/common/chibios/platform.h b/tmk_core/common/chibios/platform_deps.h index 8243dcec5..8243dcec5 100644 --- a/tmk_core/common/chibios/platform.h +++ b/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 000000000..f296d1d53 --- /dev/null +++ b/tmk_core/common/test/platform_deps.h | |||
@@ -0,0 +1,18 @@ | |||
1 | /* Copyright 2021 QMK | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 3 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #pragma once | ||
17 | |||
18 | // here just to please the build | ||