diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
| commit | 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (patch) | |
| tree | 95cf152ef65ff19c7b2515b427bbe86b92b611d0 /src/gdisp/mcufont/mf_encoding.h | |
| parent | 8bd70d953bcd3e32ceb4e45a4e561c973726280a (diff) | |
| download | uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.gz uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.bz2 uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.zip | |
For all source files update integer types to the new gI8 etc type names
Diffstat (limited to 'src/gdisp/mcufont/mf_encoding.h')
| -rw-r--r-- | src/gdisp/mcufont/mf_encoding.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gdisp/mcufont/mf_encoding.h b/src/gdisp/mcufont/mf_encoding.h index 18ffb892..7c49f02a 100644 --- a/src/gdisp/mcufont/mf_encoding.h +++ b/src/gdisp/mcufont/mf_encoding.h @@ -20,9 +20,9 @@ /* Type used to represent characters internally. */ #if MF_ENCODING == MF_ENCODING_ASCII typedef char mf_char; - #define MFCHAR2UINT16(c) ((uint16_t)(uint8_t)(c)) + #define MFCHAR2UINT16(c) ((gU16)(gU8)(c)) #else - typedef uint16_t mf_char; + typedef gU16 mf_char; #define MFCHAR2UINT16(c) (c) #endif @@ -32,7 +32,7 @@ typedef const char * mf_str; #elif MF_ENCODING == MF_ENCODING_UTF8 typedef const char * mf_str; #elif MF_ENCODING == MF_ENCODING_UTF16 -typedef const uint16_t * mf_str; +typedef const gU16 * mf_str; #elif MF_ENCODING == MF_ENCODING_WCHAR #include <stddef.h> typedef const wchar_t * mf_str; |