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/my_global.h | |
| parent | 30af2d0f49a203ae4fb97194e899fa5e13a42c1d (diff) | |
| parent | e1e82a4e00dd2cee2ff56accdd3fdbd5afeadb6a (diff) | |
| download | mariadb-git-4e4725377d27ff0101788fd7ed89670614ed8294.tar.gz | |
Merge with 4.0
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 73287a2ba2a..43cacf8fa65 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -594,8 +594,8 @@ extern double my_atof(const char*); #define closesocket(A) close(A) #endif #ifndef ulonglong2double -#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)) #endif #endif |