diff options
| author | stein3 <stein3@gmail.com> | 2020-10-06 07:15:41 -0700 |
|---|---|---|
| committer | stein3 <stein3@gmail.com> | 2020-10-06 07:15:41 -0700 |
| commit | 2e402741a89c5eec8cf30c966ce6f36d6ec9249b (patch) | |
| tree | 3592e8c5e6bd19943ae55db7fc02a5f755afbb51 /tmk_core/common/action.h | |
| parent | 3e5e4f74272c610bb9fa737f674f8e65ed6100ca (diff) | |
| parent | 2013f6313430b977e557e482d30daa279a46e75d (diff) | |
| download | qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.tar.gz qmk_firmware-2e402741a89c5eec8cf30c966ce6f36d6ec9249b.zip | |
Merge branch 'master' into meteor
Diffstat (limited to 'tmk_core/common/action.h')
| -rw-r--r-- | tmk_core/common/action.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h index c82c9c81b..345c030c9 100644 --- a/tmk_core/common/action.h +++ b/tmk_core/common/action.h | |||
| @@ -29,7 +29,7 @@ extern "C" { | |||
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | /* Disable macro and function features when LTO is enabled, since they break */ | 31 | /* Disable macro and function features when LTO is enabled, since they break */ |
| 32 | #ifdef LINK_TIME_OPTIMIZATION_ENABLE | 32 | #ifdef LTO_ENABLE |
| 33 | # ifndef NO_ACTION_MACRO | 33 | # ifndef NO_ACTION_MACRO |
| 34 | # define NO_ACTION_MACRO | 34 | # define NO_ACTION_MACRO |
| 35 | # endif | 35 | # endif |