diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-26 04:56:43 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-26 04:56:43 +0000 |
| commit | 0b37c0dfa0690c60ddf0798d8d771b74f47ebca1 (patch) | |
| tree | 3fa910e5907b75137d047363eee6680cc89228ee /tmk_core/common/avr | |
| parent | ffd7e44e5af660fbd131f67ef803ac3aad2123d6 (diff) | |
| parent | 1d1d5da43f86d9dded47c66afec94991d623f114 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common/avr')
| -rw-r--r-- | tmk_core/common/avr/suspend_avr.h | 5 | ||||
| -rw-r--r-- | tmk_core/common/avr/timer_avr.h | 5 | ||||
| -rw-r--r-- | tmk_core/common/avr/xprintf.h | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/tmk_core/common/avr/suspend_avr.h b/tmk_core/common/avr/suspend_avr.h index e4cc0be505..6df048f3bb 100644 --- a/tmk_core/common/avr/suspend_avr.h +++ b/tmk_core/common/avr/suspend_avr.h @@ -1,5 +1,4 @@ -#ifndef SUSPEND_AVR_H -#define SUSPEND_AVR_H +#pragma once #include <stdint.h> #include <stdbool.h> @@ -24,5 +23,3 @@ __asm__ __volatile__ ( \ : "r0" \ ) // clang-format on - -#endif diff --git a/tmk_core/common/avr/timer_avr.h b/tmk_core/common/avr/timer_avr.h index 9aea21c651..c1b726bd01 100644 --- a/tmk_core/common/avr/timer_avr.h +++ b/tmk_core/common/avr/timer_avr.h @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TIMER_AVR_H -#define TIMER_AVR_H 1 +#pragma once #include <stdint.h> @@ -38,5 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #if (TIMER_RAW_TOP > 255) # error "Timer0 can't count 1ms at this clock freq. Use larger prescaler." #endif - -#endif diff --git a/tmk_core/common/avr/xprintf.h b/tmk_core/common/avr/xprintf.h index 70e0f8e48a..80834f1714 100644 --- a/tmk_core/common/avr/xprintf.h +++ b/tmk_core/common/avr/xprintf.h @@ -2,8 +2,7 @@ Extended itoa, puts and printf (C)ChaN, 2011 -----------------------------------------------------------------------------*/ -#ifndef XPRINTF_H -#define XPRINTF_H +#pragma once #include <inttypes.h> #include <avr/pgmspace.h> @@ -102,5 +101,3 @@ char xatoi(char **str, long *ret); #ifdef __cplusplus } #endif - -#endif |