* configure.ac, modules/gui/skins2/utils/bezier.cpp:

   + check for lrintf() and fallback on rint().

diff --git a/configure.ac b/configure.ac
index 8428850fa2de9cedc805a75add3ad69686efaa1f..6aaf5efda8fd42e4b333bcdab790ff6d070459fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -287,7 +287,7 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd
 dnl Check for system libs needed
 need_libc=false
 
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf)
 
 dnl Check for usual libc functions
 AC_CHECK_FUNCS(strdup strndup atof lseek)

diff --git a/modules/gui/skins2/utils/bezier.cpp b/modules/gui/skins2/utils/bezier.cpp
index 9502f2ba060876188c7a280a6df32163cca6eebd..7189c5f24583218bfce36c7332f00f09db7e60ca 100644 (file)
--- a/modules/gui/skins2/utils/bezier.cpp
+++ b/modules/gui/skins2/utils/bezier.cpp
@@ -22,12 +22,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#include <vlc/vlc.h>
 #include "bezier.hpp"
 #include <math.h>
-#ifdef sun
-#   include "solaris_specific.h" // for lrintf
-#endif
 
+#ifndef HAVE_LRINTF
+#   define lrintf(a) (int)rint(a)
+#endif
 
 Bezier::Bezier( intf_thread_t *p_intf, const vector<float> &rAbscissas,
                 const vector<float> &rOrdinates, Flag_t flag )
@@ -211,4 +212,3 @@ inline float Bezier::power( float x, int n ) const
     else
         return 1;
 }
-