Merge remote-tracking branch 'origin/master' into develop

qmk · Aug 6, 2021 · 538d9d7 · 538d9d7
2 parents 3ba2ce4 + c588d23
commit 538d9d7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git 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 → tmk_core/common/arm_atsam/platform_deps.h b/tmk_core/common/arm_atsam/platform.h → tmk_core/common/arm_atsam/platform_deps.h
diff --git a/tmk_core/common/avr/platform.h → tmk_core/common/avr/platform_deps.h b/tmk_core/common/avr/platform.h → tmk_core/common/avr/platform_deps.h
diff --git a/tmk_core/common/chibios/platform.h → tmk_core/common/chibios/platform_deps.h b/tmk_core/common/chibios/platform.h → 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
@@ -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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+// here just to please the build