diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-23 14:42:31 +0200 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-23 14:42:31 +0200 |
| commit | 8ae816240359d89554ffb2f5197666c71e45f1ba (patch) | |
| tree | 8cbab18ef11dd6a2d9145bac3d88c64f57c3e062 /include/config-win.h | |
| parent | 9fc083bd9ade238ed53f82978b5588f687b033c6 (diff) | |
| parent | 0e62c9aa6301de71164496ec7c81c871d78ce8cd (diff) | |
| download | mariadb-git-8ae816240359d89554ffb2f5197666c71e45f1ba.tar.gz | |
Manual merge to 5.1.
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 ab0926af864..3a21551ebbb 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> @@ -223,13 +222,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)) @@ -284,7 +276,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 |