aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-07 22:03:36 -04:00
Code

patch 8.0.1791: using uint8_t does not work everywhere

Browse Source 
Problem:    Using uint8_t does not work everywhere.
Solution:   Use char_u instead.
This commit is contained in:
Bram Moolenaar 2018-05-05 14:29:06 +02:00
parent c136af29c0
commit 9894e394b2
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/os_win32.c
View File

@ -7661,7 +7661,7 @@ vtp_sgr_bulks(
ctermtoxterm( ctermtoxterm(
int cterm) int cterm)
{ {
uint8_t r, g, b, idx; char_u r, g, b, idx;
cterm_color2rgb(cterm, &r, &g, &b, &idx); cterm_color2rgb(cterm, &r, &g, &b, &idx);
return (((int)r << 16) | ((int)g << 8) | (int)b); return (((int)r << 16) | ((int)g << 8) | (int)b);

2
src/proto/term.pro
View File

@ -76,5 +76,5 @@ void update_tcap(int attr);
void swap_tcap(void); void swap_tcap(void);
guicolor_T gui_get_color_cmn(char_u *name); guicolor_T gui_get_color_cmn(char_u *name);
guicolor_T gui_get_rgb_color_cmn(int r, int g, int b); 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 : */ /* vim: set ft=c : */

4
src/term.c
View File

@ -6981,7 +6981,7 @@ static int grey_ramp[] = {
# define VTERM_ANSI_INDEX_NONE 0 # define VTERM_ANSI_INDEX_NONE 0
# endif # endif
static uint8_t ansi_table[16][4] = { static char_u ansi_table[16][4] = {
// R G B idx // R G B idx
{ 0, 0, 0, 1}, // black { 0, 0, 0, 1}, // black
{224, 0, 0, 2}, // dark red {224, 0, 0, 2}, // dark red
@ -7003,7 +7003,7 @@ static uint8_t ansi_table[16][4] = {
}; };
void 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; int idx;

2
src/version.c
View File

@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1791,
/**/ /**/
1790, 1790,
/**/ /**/