diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-04 19:43:45 +1100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-04 19:43:45 +1100 |
| commit | 2bb2977c133646c4e056960e72029270d77cc1eb (patch) | |
| tree | 235d491f992121ac1716c5bf2fafb80983748576 /tmk_core/common/command.h | |
| parent | a55c838961c89097ab849ed6cb1f261791e6b9b4 (diff) | |
| parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
| download | qmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.tar.gz qmk_firmware-2bb2977c133646c4e056960e72029270d77cc1eb.zip | |
Merge branch 'master' into debounce_refactor
# Conflicts:
# tmk_core/common/keyboard.c
Diffstat (limited to 'tmk_core/common/command.h')
| -rw-r--r-- | tmk_core/common/command.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tmk_core/common/command.h b/tmk_core/common/command.h index d9d89ba0f..c38f2b9e8 100644 --- a/tmk_core/common/command.h +++ b/tmk_core/common/command.h | |||
| @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef COMMAND_H | 18 | #pragma once |
| 19 | #define COMMAND | ||
| 20 | 19 | ||
| 21 | /* FIXME: Add doxygen comments for the behavioral defines in here. */ | 20 | /* FIXME: Add doxygen comments for the behavioral defines in here. */ |
| 22 | 21 | ||
| @@ -155,5 +154,3 @@ bool command_proc(uint8_t code); | |||
| 155 | 154 | ||
| 156 | #define XMAGIC_KC(key) KC_##key | 155 | #define XMAGIC_KC(key) KC_##key |
| 157 | #define MAGIC_KC(key) XMAGIC_KC(key) | 156 | #define MAGIC_KC(key) XMAGIC_KC(key) |
| 158 | |||
| 159 | #endif | ||