From b5b9a7ba6d79239bfc35d86ae692f1d16f47512b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 30 Sep 2017 11:56:30 +0530 Subject: [PATCH] Fix compilation with clang --- kitty/shaders.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/kitty/shaders.c b/kitty/shaders.c index f27775c6d..a74bc3b89 100644 --- a/kitty/shaders.c +++ b/kitty/shaders.c @@ -212,21 +212,15 @@ draw_cells_impl(ssize_t vao_idx, GLfloat xstart, GLfloat ystart, GLfloat dx, GLf size_t sz; void *address; bool inverted = screen_invert_colors(screen); -#define int GLint -#define float GLfloat -#define uint GLuint struct CellRenderData { - float xstart, ystart, dx, dy, sprite_dx, sprite_dy; + GLfloat xstart, ystart, dx, dy, sprite_dx, sprite_dy; - uint default_fg, default_bg, highlight_fg, highlight_bg, cursor_color, url_color; + GLuint default_fg, default_bg, highlight_fg, highlight_bg, cursor_color, url_color; - int color1, color2; + GLint color1, color2; - uint xnum, ynum, cursor_x, cursor_y, cursor_w, url_xl, url_yl, url_xr, url_yr; + GLuint xnum, ynum, cursor_x, cursor_y, cursor_w, url_xl, url_yl, url_xr, url_yr; }; -#undef int -#undef float -#undef uint enum { cell_data_buffer, selection_buffer, uniform_buffer }; static struct CellRenderData *rd;