summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2016-03-22 20:30:25 +0100
committerErez Zukerman <bulk@ezuk.org>2016-03-22 20:30:25 +0100
commit403d756ad56de18488e3d048e849c55e77a20b32 (patch)
treeb02cd9a378a29d9b8cde07a7d97b46c24e74a3b1 /keyboard/ergodox_ez/keymaps/osx_de/keymap.c
parent7f0d77e08c6b5d75a1f912051e6d2928d66e7c3b (diff)
parentbaeffd99da5603cd5156bbcf0cd45ae62711858f (diff)
downloadqmk_firmware-403d756ad56de18488e3d048e849c55e77a20b32.tar.gz
qmk_firmware-403d756ad56de18488e3d048e849c55e77a20b32.tar.xz
Merge pull request #190 from yoyoerx/function_pointers
Addressing void* return warning & coding style
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/osx_de/keymap.c')
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_de/keymap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
index 0298cb702..b31d0edcd 100644
--- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c
@@ -390,12 +390,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
};
// Runs just one time when the keyboard initializes.
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
};
// Runs constantly in the background, in a loop.
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
uint8_t layer = biton32(layer_state);