From 9894e394b230723abefc05a1c9a336b05a63088b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 5 May 2018 14:29:06 +0200 Subject: [PATCH] patch 8.0.1791: using uint8_t does not work everywhere Problem: Using uint8_t does not work everywhere. Solution: Use char_u instead. --- src/os_win32.c | 2 +- src/proto/term.pro | 2 +- src/term.c | 4 ++-- src/version.c | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/os_win32.c b/src/os_win32.c index c474415c8b..a90dc1f79b 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 333df92d6a..7eafdeffa9 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 08eee67f5f..49dee03013 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 467b14e4f8..9dd2895edf 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1791, /**/ 1790, /**/ -- 2.47.2