summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2004-08-26 20:43:58 +0200
committerunknown <joerg@mysql.com>2004-08-26 20:43:58 +0200
commit78b4ddbe22dc126c298df95c6f8888f5c7175f7a (patch)
tree5a2323ebadc2210f18ec4271c4e45cb17551f9a9 /include
parent4b47cc97aaff047f62866f7f3521e618725b2ee6 (diff)
parent1275b4c51314db24615efd7996a1d5266a03d2ba (diff)
downloadmariadb-git-78b4ddbe22dc126c298df95c6f8888f5c7175f7a.tar.gz
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1 BitKeeper/etc/logging_ok: auto-union
Diffstat (limited to 'include')
-rw-r--r--include/m_string.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 0709dbaffb4..97d34421537 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -238,6 +238,9 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error);
#ifndef HAVE_STRTOULL
#define HAVE_STRTOULL
#endif
+#ifndef HAVE_STRTOLL
+#define HAVE_STRTOLL
+#endif
#else
#ifdef HAVE_LONG_LONG
extern char *longlong2str(longlong val,char *dst,int radix);