summaryrefslogtreecommitdiff
path: root/strings/my_strtoll10.c
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-11-20 03:12:17 +0200
committerunknown <monty@mashka.mysql.fi>2003-11-20 03:12:17 +0200
commitf25cbdd9141004e6e9f0a7313d763c1cc1de36ec (patch)
tree01b3bf0b14b474fb27f3c09581831b724653d93a /strings/my_strtoll10.c
parentc3b5f686b5797c773e8f974cfbb702107baca8f5 (diff)
parent1449a3346b3e04bf081f49fa252257ef6a377c70 (diff)
downloadmariadb-git-f25cbdd9141004e6e9f0a7313d763c1cc1de36ec.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
Diffstat (limited to 'strings/my_strtoll10.c')
-rw-r--r--strings/my_strtoll10.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c
index f795ef64728..117b9d16a65 100644
--- a/strings/my_strtoll10.c
+++ b/strings/my_strtoll10.c
@@ -18,6 +18,7 @@
#include <my_sys.h>
#include <m_string.h>
+#undef ULONGLONG_MAX
#define ULONGLONG_MAX (~(ulonglong) 0)
#define MAX_NEGATIVE_NUMBER ((ulonglong) LL(0x8000000000000000))
#define INIT_CNT 9