[tyndur-devel] [PATCH v2 03/24] cdi/vesa: Entferne "inline"
Max Reitz ·
* Die Funktionen sind im Header zwar als inline deklariert, dort ist aber nur der Funktionskopf. Weil das "inline" vermutlich tatsächlich nichts bewirkt und GCC obendrein bei -std=gnu11 drüber meckert, ist es am besten, es einfach zu entfernen. Signed-off-by: Max Reitz <max at tyndur.org> --- src/modules/cdi/vesa/drawing.c | 12 ++++++------ src/modules/cdi/vesa/drawing.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/modules/cdi/vesa/drawing.c b/src/modules/cdi/vesa/drawing.c index b169ec2..8f53e8b 100644 --- a/src/modules/cdi/vesa/drawing.c +++ b/src/modules/cdi/vesa/drawing.c @@ -422,7 +422,7 @@ void vesa_draw_bitmap_part(struct cdi_video_bitmap* target, } } -inline void vesa_draw_dot(struct cdi_video_bitmap* target, unsigned int x, +void vesa_draw_dot(struct cdi_video_bitmap* target, unsigned int x, unsigned int y, struct cdi_video_color* color) { // Ungueltige Positionen abfangen @@ -454,7 +454,7 @@ inline void vesa_draw_dot(struct cdi_video_bitmap* target, unsigned int x, *start |= newcolor & colormask; } -inline uint32_t do_rop(enum cdi_video_raster_op rop, uint32_t new, uint32_t old) +uint32_t do_rop(enum cdi_video_raster_op rop, uint32_t new, uint32_t old) { switch (rop) { case CDI_VIDEO_ROP_OR: @@ -472,7 +472,7 @@ inline uint32_t do_rop(enum cdi_video_raster_op rop, uint32_t new, uint32_t old) } } -inline uint32_t convert_color(struct cdi_video_pixel_format fmt, +uint32_t convert_color(struct cdi_video_pixel_format fmt, struct cdi_video_color* cdicolor) { uint32_t red, blue, green, alpha, color; @@ -493,7 +493,7 @@ inline uint32_t convert_color(struct cdi_video_pixel_format fmt, return color; } -inline struct cdi_video_color* convert_color_from_pixel(struct cdi_video_pixel_format +struct cdi_video_color* convert_color_from_pixel(struct cdi_video_pixel_format fmt, uint32_t value) { struct cdi_video_color* color = malloc(sizeof(struct cdi_video_color)); @@ -520,7 +520,7 @@ inline struct cdi_video_color* convert_color_from_pixel(struct cdi_video_pixel_f return color; } -inline void* get_read_buffer_addr(struct cdi_video_bitmap* bitmap) +void* get_read_buffer_addr(struct cdi_video_bitmap* bitmap) { int x; char* addr = NULL; @@ -537,7 +537,7 @@ inline void* get_read_buffer_addr(struct cdi_video_bitmap* bitmap) return NULL; } -inline void* get_write_buffer_addr(struct cdi_video_bitmap* bitmap) +void* get_write_buffer_addr(struct cdi_video_bitmap* bitmap) { int x; char* addr = NULL; diff --git a/src/modules/cdi/vesa/drawing.h b/src/modules/cdi/vesa/drawing.h index bed6043..76b1fee 100644 --- a/src/modules/cdi/vesa/drawing.h +++ b/src/modules/cdi/vesa/drawing.h @@ -47,16 +47,16 @@ void vesa_draw_bitmap_part(struct cdi_video_bitmap* target, struct cdi_video_bitmap* bitmap, unsigned int x, unsigned int y, unsigned int srcx, unsigned int srcy, unsigned int width, unsigned int height); -inline void vesa_draw_dot(struct cdi_video_bitmap* target, unsigned int x, +void vesa_draw_dot(struct cdi_video_bitmap* target, unsigned int x, unsigned int y, struct cdi_video_color* color); -inline uint32_t do_rop(enum cdi_video_raster_op rop, uint32_t new, uint32_t old); -inline uint32_t convert_color(struct cdi_video_pixel_format fmt, +uint32_t do_rop(enum cdi_video_raster_op rop, uint32_t new, uint32_t old); +uint32_t convert_color(struct cdi_video_pixel_format fmt, struct cdi_video_color* cdicolor); -inline struct cdi_video_color* convert_color_from_pixel(struct cdi_video_pixel_format +struct cdi_video_color* convert_color_from_pixel(struct cdi_video_pixel_format fmt, uint32_t value); -inline void* get_read_buffer_addr(struct cdi_video_bitmap* bitmap); -inline void* get_write_buffer_addr(struct cdi_video_bitmap* bitmap); +void* get_read_buffer_addr(struct cdi_video_bitmap* bitmap); +void* get_write_buffer_addr(struct cdi_video_bitmap* bitmap); #endif /* __VESA_DRAWING_H__ */ -- 2.6.3