summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
diff options
context:
space:
mode:
authorNoah Andrews2016-03-28 18:37:39 -0400
committerNoah Andrews2016-03-28 18:37:39 -0400
commit535daad3cd812df58f4630df202a447836ac3084 (patch)
tree4591f47555acb1d88f08caa7ab3bbb40fd828637 /keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
parentccf848917b7e931327f6c4a469877e9d8ef238ea (diff)
parent4a43c5684476611370820bd9592712754c211c52 (diff)
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c')
-rw-r--r--keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c b/keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
index f71ca28ce..1032be549 100644
--- a/keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
@@ -162,12 +162,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);