summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorAlexey Kopytov <alexeyk@mysql.com>2008-12-07 17:51:22 +0300
committerAlexey Kopytov <alexeyk@mysql.com>2008-12-07 17:51:22 +0300
commit6aa4125be3ff8d910fff82ff53ace4075a39cc94 (patch)
tree82715ba21e2d49dfb58b215e7cc5d9af0294a0b6 /include/my_global.h
parent014143e8588c4313ccf10e269aa34a997f5772b6 (diff)
parent91f0c94c23eb9b48421d9590662666de9e4c75d5 (diff)
downloadmariadb-git-6aa4125be3ff8d910fff82ff53ace4075a39cc94.tar.gz
Merge from mysql-5.0-bugteam to mysql-5.1-bugteam.
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 4feed96e7d6..8fb5a6b69da 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -789,6 +789,9 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define ulonglong2double(A) ((double) (ulonglong) (A))
#define my_off_t2double(A) ((double) (my_off_t) (A))
#endif
+#ifndef double2ulonglong
+#define double2ulonglong(A) ((ulonglong) (double) (A))
+#endif
#endif
#ifndef offsetof