diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-15 21:44:45 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-15 21:44:45 +0200 |
| commit | 00ce63dc230b6c8f55997b09396aee6d6d722734 (patch) | |
| tree | d451f37d4419d18234669e71139921ac6df101df | |
| parent | 81b07b527e8b9c35d12fd45b63885d6938564723 (diff) | |
patch 8.0.1198: older compilers don't know uint8_tv8.0.1198
Problem: Older compilers don't know uint8_t.
Solution: Use char_u instead.
| -rw-r--r-- | src/proto/term.pro | 4 | ||||
| -rw-r--r-- | src/term.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/proto/term.pro b/src/proto/term.pro index 147981c688..ef74f5647c 100644 --- a/src/proto/term.pro +++ b/src/proto/term.pro @@ -64,8 +64,8 @@ char_u *get_termcode(int i); void del_termcode(char_u *name); void set_mouse_topline(win_T *wp); int check_termcode(int max_offset, char_u *buf, int bufsize, int *buflen); -void term_get_fg_color(uint8_t *r, uint8_t *g, uint8_t *b); -void term_get_bg_color(uint8_t *r, uint8_t *g, uint8_t *b); +void term_get_fg_color(char_u *r, char_u *g, char_u *b); +void term_get_bg_color(char_u *r, char_u *g, char_u *b); char_u *replace_termcodes(char_u *from, char_u **bufp, int from_part, int do_lt, int special); int find_term_bykeys(char_u *src); void show_termcodes(void); diff --git a/src/term.c b/src/term.c index 7a48f995ac..4a202bb50f 100644 --- a/src/term.c +++ b/src/term.c @@ -3529,7 +3529,7 @@ may_req_bg_color(void) { int didit = FALSE; -#ifdef FEAT_TERMINAL +# ifdef FEAT_TERMINAL /* Only request foreground if t_RF is set. */ if (rfg_status == STATUS_GET && *T_RFG != NUL) { @@ -3538,7 +3538,7 @@ may_req_bg_color(void) rfg_status = STATUS_SENT; didit = TRUE; } -#endif +# endif /* Only request background if t_RB is set. */ if (rbg_status == STATUS_GET && *T_RBG != NUL) @@ -5833,7 +5833,7 @@ check_termcode( * Get the text foreground color, if known. */ void -term_get_fg_color(uint8_t *r, uint8_t *g, uint8_t *b) +term_get_fg_color(char_u *r, char_u *g, char_u *b) { if (rfg_status == STATUS_GOT) { @@ -5847,7 +5847,7 @@ term_get_fg_color(uint8_t *r, uint8_t *g, uint8_t *b) * Get the text background color, if known. */ void -term_get_bg_color(uint8_t *r, uint8_t *g, uint8_t *b) +term_get_bg_color(char_u *r, char_u *g, char_u *b) { if (rbg_status == STATUS_GOT) { diff --git a/src/version.c b/src/version.c index 2115ead38e..0fbb99e36c 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1198, +/**/ 1197, /**/ 1196, |