summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-04-09 20:17:32 +0200
committerFred Sundvik <fsundvik@gmail.com>2017-04-13 15:00:29 +0200
commitf7b59427faeaef210227017c8a173f1324fbc795 (patch)
treef9b3a0c363f2788c844cc2e7673721a4f5365db4
parent12159e782cc6233b82760bf21631be730d42087b (diff)
downloadqmk_firmware-f7b59427faeaef210227017c8a173f1324fbc795.tar.gz
qmk_firmware-f7b59427faeaef210227017c8a173f1324fbc795.tar.xz
Fix name collision between ChibiOS and keymap_german
-rw-r--r--quantum/keymap_extras/keymap_german_ch.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_german_ch.h
index 8332e00af..67350d660 100644
--- a/quantum/keymap_extras/keymap_german_ch.h
+++ b/quantum/keymap_extras/keymap_german_ch.h
@@ -33,6 +33,10 @@
#define CH_E KC_E
#define CH_F KC_F
#define CH_G KC_G
+#ifdef CH_H
+// The ChibiOS ch.h file defines this...
+#undef CH_H
+#endif
#define CH_H KC_H
#define CH_I KC_I
#define CH_J KC_J