From e7032b4cdd6f41fe952cb1b7edc233a6eea38e27 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 4 Oct 2010 18:16:38 +0000 Subject: [PATCH] Change libvgl's set4pixels() and set2lines() functions from plain 'inline' to 'static inline'. Otherwise, a C99 compiler (such as clang) will output an undefined symbol for those functions in the resulting object file. (Even gcc will do this, when you use "-std=c99".) This should fix the "undefined reference to `set4pixels'" errors that some people were seeing during ports building, when their world was compiled with clang. Approved by: rpaulo (mentor) --- lib/libvgl/simple.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c index b7d789a57a7..09ca9b00ccc 100644 --- a/lib/libvgl/simple.c +++ b/lib/libvgl/simple.c @@ -249,8 +249,8 @@ VGLFilledBox(VGLBitmap *object, int x1, int y1, int x2, int y2, u_long color) for (y=y1; y<=y2; y++) VGLLine(object, x1, y, x2, y, color); } -void -inline set4pixels(VGLBitmap *object, int x, int y, int xc, int yc, u_long color) +static inline void +set4pixels(VGLBitmap *object, int x, int y, int xc, int yc, u_long color) { if (x!=0) { VGLSetXY(object, xc+x, yc+y, color); @@ -290,8 +290,8 @@ VGLEllipse(VGLBitmap *object, int xc, int yc, int a, int b, u_long color) } } -void -inline set2lines(VGLBitmap *object, int x, int y, int xc, int yc, u_long color) +static inline void +set2lines(VGLBitmap *object, int x, int y, int xc, int yc, u_long color) { if (x!=0) { VGLLine(object, xc+x, yc+y, xc-x, yc+y, color);