diff options
| author | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
| commit | e7f4d56592b3975c38af329e77b4efd9108495e8 (patch) | |
| tree | 0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /tmk_core/common/progmem.h | |
| parent | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff) | |
| parent | 8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/progmem.h')
| -rw-r--r-- | tmk_core/common/progmem.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tmk_core/common/progmem.h b/tmk_core/common/progmem.h index de93138397..88373f478b 100644 --- a/tmk_core/common/progmem.h +++ b/tmk_core/common/progmem.h @@ -2,12 +2,12 @@ #define PROGMEM_H 1 #if defined(__AVR__) -# include <avr/pgmspace.h> +# include <avr/pgmspace.h> #else -# define PROGMEM -# define pgm_read_byte(p) *((unsigned char*)(p)) -# define pgm_read_word(p) *((uint16_t*)(p)) -# define pgm_read_dword(p) *((uint32_t*)(p)) +# define PROGMEM +# define pgm_read_byte(p) *((unsigned char*)(p)) +# define pgm_read_word(p) *((uint16_t*)(p)) +# define pgm_read_dword(p) *((uint32_t*)(p)) #endif #endif |