diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-05-05 14:29:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-05-05 14:29:06 +0200 |
| commit | 9894e394b230723abefc05a1c9a336b05a63088b (patch) | |
| tree | 9ccb3287014a974ae857cc0bbe31531a3b99af74 | |
| parent | c136af29c0b1939076fbae7d36afd90dce740315 (diff) | |
| download | vim-git-9894e394b230723abefc05a1c9a336b05a63088b.tar.gz | |
patch 8.0.1791: using uint8_t does not work everywherev8.0.1791
Problem: Using uint8_t does not work everywhere.
Solution: Use char_u instead.
| -rw-r--r-- | src/os_win32.c | 2 | ||||
| -rw-r--r-- | src/proto/term.pro | 2 | ||||
| -rw-r--r-- | src/term.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index c474415c8..a90dc1f79 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -7661,7 +7661,7 @@ vtp_sgr_bulks( ctermtoxterm( int cterm) { - uint8_t r, g, b, idx; + char_u r, g, b, idx; cterm_color2rgb(cterm, &r, &g, &b, &idx); return (((int)r << 16) | ((int)g << 8) | (int)b); diff --git a/src/proto/term.pro b/src/proto/term.pro index 333df92d6..7eafdeffa 100644 --- a/src/proto/term.pro +++ b/src/proto/term.pro @@ -76,5 +76,5 @@ void update_tcap(int attr); void swap_tcap(void); guicolor_T gui_get_color_cmn(char_u *name); guicolor_T gui_get_rgb_color_cmn(int r, int g, int b); -void cterm_color2rgb(int nr, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *ansi_idx); +void cterm_color2rgb(int nr, char_u *r, char_u *g, char_u *b, char_u *ansi_idx); /* vim: set ft=c : */ diff --git a/src/term.c b/src/term.c index 08eee67f5..49dee0301 100644 --- a/src/term.c +++ b/src/term.c @@ -6981,7 +6981,7 @@ static int grey_ramp[] = { # define VTERM_ANSI_INDEX_NONE 0 # endif -static uint8_t ansi_table[16][4] = { +static char_u ansi_table[16][4] = { // R G B idx { 0, 0, 0, 1}, // black {224, 0, 0, 2}, // dark red @@ -7003,7 +7003,7 @@ static uint8_t ansi_table[16][4] = { }; void -cterm_color2rgb(int nr, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *ansi_idx) +cterm_color2rgb(int nr, char_u *r, char_u *g, char_u *b, char_u *ansi_idx) { int idx; diff --git a/src/version.c b/src/version.c index 467b14e4f..9dd2895ed 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 */ /**/ + 1791, +/**/ 1790, /**/ 1789, |