summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-01-23 17:12:25 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-01-23 17:12:25 +0100
commit19d13a3b17d613c04acbcd8c7a0578a55e0c2938 (patch)
tree3e68a9b34873bffa9d83a7ab26de6b161a37efc7 /include/my_global.h
parent7baa64fc6182ca2baf3da6888044ef5411b51727 (diff)
downloadmariadb-git-19d13a3b17d613c04acbcd8c7a0578a55e0c2938.tar.gz
portability fixes for FreeBSD 8 and 9
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 8d54448f477..26cba5b4ed7 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -372,9 +372,6 @@ C_MODE_END
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
-#ifdef HAVE_SYS_TIMEB_H
-#include <sys/timeb.h> /* Avoid warnings on SCO */
-#endif
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
@@ -858,7 +855,7 @@ static inline double my_isinf(double x)
This will be slightly slower and perhaps a tiny bit less accurate than
doing it the IEEE754 way but log2() should be available on C99 systems.
*/
-inline double log2(double x)
+static inline double log2(double x)
{
return (log(x) / M_LN2);
}