summaryrefslogtreecommitdiff
path: root/include/m_string.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-05-19 16:38:12 +0300
committermonty@mysql.com <>2004-05-19 16:38:12 +0300
commit86a966256be6818d20d138c1e687e1f195ddaf74 (patch)
tree8d62bd5b112fa2148c1631a51cc9fa272dcf5d16 /include/m_string.h
parentfdc0f0e781051150ac187a92df1ff8f9ae3286c7 (diff)
downloadmariadb-git-86a966256be6818d20d138c1e687e1f195ddaf74.tar.gz
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile Removed compiler warnings Better setting of server_version variable. Fix that make_win_src_distribution creates the privilege tables.
Diffstat (limited to 'include/m_string.h')
-rw-r--r--include/m_string.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 934ad1c42b5..eb2758ec506 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -232,6 +232,7 @@ extern char *str2int(const char *src,int radix,long lower,long upper,
#if SIZEOF_LONG == SIZEOF_LONG_LONG
#define longlong2str(A,B,C) int2str((A),(B),(C))
#define longlong10_to_str(A,B,C) int10_to_str((A),(B),(C))
+#undef strtoll
#define strtoll(A,B,C) strtol((A),(B),(C))
#define strtoull(A,B,C) strtoul((A),(B),(C))
#ifndef HAVE_STRTOULL