summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-05-26 19:11:22 +0300
committerunknown <monty@narttu.mysql.fi>2003-05-26 19:11:22 +0300
commit6f8e0d13642a43f35f4deb15437be029df023b45 (patch)
tree9cac5a3c7a7067dbf4a68793f0de86fe1b298f57 /include
parent6fea1f3373ef5568a1e4242a1eac9e832397da01 (diff)
downloadmariadb-git-6f8e0d13642a43f35f4deb15437be029df023b45.tar.gz
Fix for 64 bit machines (To remove warnings on Itanium)
mysys/thr_alarm.c: Safety fix
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 15495c60dd7..ca24c21c688 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -634,7 +634,12 @@ extern double my_atof(const char*);
Max size that must be added to a so that we know Size to make
adressable obj.
*/
+#if SIZEOF_CHARP == 4
typedef long my_ptrdiff_t;
+#else
+typedef long long my_ptrdiff_t;
+#endif
+
#define MY_ALIGN(A,L) (((A) + (L) - 1) & ~((L) - 1))
#define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double))
/* Size to make adressable obj. */