Date: Mon, 4 Oct 2010 18:16:38 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r213412 - head/lib/libvgl Message-ID: <201010041816.o94IGcDx022697@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Mon Oct 4 18:16:38 2010 New Revision: 213412 URL: http://svn.freebsd.org/changeset/base/213412 Log: 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) Modified: head/lib/libvgl/simple.c Modified: head/lib/libvgl/simple.c ============================================================================== --- head/lib/libvgl/simple.c Mon Oct 4 18:09:01 2010 (r213411) +++ head/lib/libvgl/simple.c Mon Oct 4 18:16:38 2010 (r213412) @@ -249,8 +249,8 @@ VGLFilledBox(VGLBitmap *object, int x1, 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, in } } -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010041816.o94IGcDx022697>