dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clock_gettime detection in autotools 

AC_CHECK_FUNCS checks for the existence of functions in the C standard
library, so we don't need it. Instead, we need to define
HAVE_CLOCK_GETTIME if the function was found inside the librt.

Moreover, in source file check if HAVE_CLOCK_GETTIME is defined rather
than of checking if it's 0.



SVN revision: 52863
This commit is contained in:
Lucas De Marchi 2010-09-28 19:36:50 +00:00
parent 8737d28c76
commit 61a510d387
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/ecore/configure.ac
View File

@ -421,11 +421,7 @@ AC_SUBST(dlopen_libs)
AC_SUBST(rt_libs)
if test -n "$rt_libs"; then
_bkp_LIBS="$LIBS"
LIBS="$LIBS $rt_libs"
AC_CHECK_FUNCS(clock_gettime)
LIBS="$_bkp_LIBS"
unset _bkp_LIBS
AC_DEFINE(HAVE_CLOCK_GETTIME, [1], [Have clock_gettime()])
fi
# Eina library

13
legacy/ecore/src/lib/ecore/ecore_time.c
View File

@ -17,10 +17,8 @@
#include <time.h>
#if HAVE_CLOCK_GETTIME
#ifdef HAVE_CLOCK_GETTIME
static clockid_t _ecore_time_clock_id = -1;
#else
static int _ecore_time_clock_id = -1;
#endif
double _ecore_time_loop_time = -1.0;
@ -43,9 +41,7 @@ double _ecore_time_loop_time = -1.0;
EAPI double
ecore_time_get(void)
{
#if !HAVE_CLOCK_GETTIME
return ecore_time_unix_get();
#else
#ifdef HAVE_CLOCK_GETTIME
struct timespec t;
if (EINA_UNLIKELY(_ecore_time_clock_id < 0))
@ -59,6 +55,8 @@ ecore_time_get(void)
}
return (double)t.tv_sec + (((double)t.tv_nsec) / 1000000000.0);
#else
return ecore_time_unix_get();
#endif
}
@ -126,7 +124,7 @@ ecore_loop_time_get(void)
void
_ecore_time_init(void)
{
#if HAVE_CLOCK_GETTIME
#ifdef HAVE_CLOCK_GETTIME
struct timespec t;
if (_ecore_time_clock_id != -1) return;
@ -150,7 +148,6 @@ _ecore_time_init(void)
}
#else
# warning "Your platform isn't supported yet"
_ecore_time_clock_id = -2;
CRIT("Platform does not support clock_gettime. "
"Fallback to unix time.");
#endif