summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-10-27 11:18:44 +0100
committerunknown <serg@serg.mylan>2003-10-27 11:18:44 +0100
commit8f917ccd9d6aab3f6c57a3953a2f8daa0a1d2f8a (patch)
treee3a6a19ce697b0df82fa820738648317dde05f0b /include
parent489b3926db788a9d28804b57012229ad78ceed95 (diff)
downloadmariadb-git-8f917ccd9d6aab3f6c57a3953a2f8daa0a1d2f8a.tar.gz
correct casting in ulonglong2double
Diffstat (limited to 'include')
-rw-r--r--include/config-win.h4
-rw-r--r--include/my_global.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/config-win.h b/include/config-win.h
index 9f903b3bcd2..53dff5d63af 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -173,8 +173,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)
diff --git a/include/my_global.h b/include/my_global.h
index 59e0c43f18d..349ac8ac82e 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -571,8 +571,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