diff options
author | Ignacio Galarza <iggy@mysql.com> | 2009-03-17 16:29:24 -0400 |
---|---|---|
committer | Ignacio Galarza <iggy@mysql.com> | 2009-03-17 16:29:24 -0400 |
commit | 0d588edf61c93ab67fb7e26101a0fc00d021bb11 (patch) | |
tree | 3c313f70fd16653491985d8e8108fb5b99f0d5d0 /include/config-win.h | |
parent | 5b7347bda31b9d66cd78937e5dc339f553b9a736 (diff) | |
parent | 7ca1ebd83a1a7d291593be7a94f5a37298dfc863 (diff) | |
download | mariadb-git-0d588edf61c93ab67fb7e26101a0fc00d021bb11.tar.gz |
auto-merge
Diffstat (limited to 'include/config-win.h')
-rw-r--r-- | include/config-win.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/config-win.h b/include/config-win.h index ab4da080299..26b08a5e4fb 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -33,7 +33,6 @@ functions */ #include <sys/locking.h> #include <winsock2.h> -#include <math.h> /* Because of rint() */ #include <fcntl.h> #include <io.h> #include <malloc.h> @@ -226,13 +225,6 @@ typedef uint rf_SetTimer; #define inline __inline #endif /* __cplusplus */ -inline double rint(double nr) -{ - double f = floor(nr); - double c = ceil(nr); - return (((c-nr) >= (nr-f)) ? f :c); -} - #ifdef _WIN64 #define ulonglong2double(A) ((double) (ulonglong) (A)) #define my_off_t2double(A) ((double) (my_off_t) (A)) @@ -287,7 +279,6 @@ inline ulonglong double2ulonglong(double d) #define HAVE_FLOAT_H #define HAVE_LIMITS_H #define HAVE_STDDEF_H -#define HAVE_RINT /* defined in this file */ #define NO_FCNTL_NONBLOCK /* No FCNTL */ #define HAVE_ALLOCA #define HAVE_STRPBRK |