diff options
| author | monty@narttu.mysql.fi <> | 2003-11-04 09:40:36 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-11-04 09:40:36 +0200 |
| commit | 4e4725377d27ff0101788fd7ed89670614ed8294 (patch) | |
| tree | d387df22d5d3ffed50ecd8620f1eb18bc61ead7e /include/config-win.h | |
| parent | 30af2d0f49a203ae4fb97194e899fa5e13a42c1d (diff) | |
| parent | e1e82a4e00dd2cee2ff56accdd3fdbd5afeadb6a (diff) | |
| download | mariadb-git-4e4725377d27ff0101788fd7ed89670614ed8294.tar.gz | |
Merge with 4.0
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index 884b2edfb63..4fdbfbbd02f 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -183,8 +183,8 @@ inline double rint(double nr) } #ifdef _WIN64 -#define ulonglong2double(A) ((double) (A)) -#define my_off_t2double(A) ((double) (A)) +#define ulonglong2double(A) ((double) (ulonglong) (A)) +#define my_off_t2double(A) ((double) (my_off_t) (A)) #else inline double ulonglong2double(ulonglong value) |