diff options
| author | Erez Zukerman <bulk@ezuk.org> | 2016-03-22 21:30:25 +0200 |
|---|---|---|
| committer | Erez Zukerman <bulk@ezuk.org> | 2016-03-22 21:30:25 +0200 |
| commit | 403d756ad56de18488e3d048e849c55e77a20b32 (patch) | |
| tree | b02cd9a378a29d9b8cde07a7d97b46c24e74a3b1 /tmk_core | |
| parent | 7f0d77e08c6b5d75a1f912051e6d2928d66e7c3b (diff) | |
| parent | baeffd99da5603cd5156bbcf0cd45ae62711858f (diff) | |
| download | qmk_firmware-403d756ad56de18488e3d048e849c55e77a20b32.tar.gz qmk_firmware-403d756ad56de18488e3d048e849c55e77a20b32.zip | |
Merge pull request #190 from yoyoerx/function_pointers
Addressing void* return warning & coding style
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/matrix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index 85415df71..0b013fc98 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h | |||
| @@ -64,8 +64,8 @@ void matrix_power_up(void); | |||
| 64 | void matrix_power_down(void); | 64 | void matrix_power_down(void); |
| 65 | 65 | ||
| 66 | /* keyboard-specific setup/loop functionality */ | 66 | /* keyboard-specific setup/loop functionality */ |
| 67 | void * matrix_init_kb(void); | 67 | void matrix_init_kb(void); |
| 68 | void * matrix_scan_kb(void); | 68 | void matrix_scan_kb(void); |
| 69 | 69 | ||
| 70 | #ifdef __cplusplus | 70 | #ifdef __cplusplus |
| 71 | } | 71 | } |