summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-10-10 17:38:17 +0300
committerSergey Petrunya <psergey@askmonty.org>2010-10-10 17:38:17 +0300
commita285ce3e588adf93baccc2bcf4000177c396b70e (patch)
tree5d8ecdb7867ca78617ba844fcf3cce7f1662f3bb /include
parent72dd7575cd8b9372ddb79cc4c94050e4ee1e5ee1 (diff)
downloadmariadb-git-a285ce3e588adf93baccc2bcf4000177c396b70e.tar.gz
Post-merge fixes part 1
Diffstat (limited to 'include')
-rw-r--r--include/m_string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 26fa41d9cc4..892d3a44868 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -219,7 +219,7 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error);
#endif
#else
#ifdef HAVE_LONG_LONG
- extern char *longlong2str(longlong val,char *dst,int radix, int upcase);
+extern char *longlong2str(longlong val,char *dst,int radix, int upcase);
extern char *longlong10_to_str(longlong val,char *dst,int radix);
#if (!defined(HAVE_STRTOULL) || defined(NO_STRTOLL_PROTO))
extern longlong strtoll(const char *str, char **ptr, int base);