summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-08-16 12:50:21 +0300
committerunknown <monty@hundin.mysql.fi>2002-08-16 12:50:21 +0300
commita36419b7f584fce00b60c261a92dbb6e9fba4d14 (patch)
tree048be44f2729df765d9fe62786eb2d1c27c998c0
parent6fbcad539d7f3c96dca4aa3cfdf4d28ee0d4ced2 (diff)
downloadmariadb-git-a36419b7f584fce00b60c261a92dbb6e9fba4d14.tar.gz
Fixed typo so that ulonglong are properly converted to double on AIX with gcc 3.1
Docs/manual.texi: Changelog
-rw-r--r--Docs/manual.texi12
-rw-r--r--include/global.h10
-rw-r--r--mysys/my_port.c2
3 files changed, 18 insertions, 6 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 68df1acd68c..fee61a729c6 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -46868,6 +46868,7 @@ users use this code as the rest of the code and because of this we are
not yet 100% confident in this code.
@menu
+* News-3.23.53:: Changes in release 3.23.53
* News-3.23.52:: Changes in release 3.23.52
* News-3.23.51:: Changes in release 3.23.51
* News-3.23.50:: Changes in release 3.23.50
@@ -46924,13 +46925,18 @@ not yet 100% confident in this code.
* News-3.23.0:: Changes in release 3.23.0
@end menu
-@node News-3.23.52, News-3.23.51, News-3.23.x, News-3.23.x
+@node News-3.23.53, News-3.23.52, News-3.23.x, News-3.23.x
+@appendixsubsec Changes in release 3.23.53
+@itemize @bullet
+@item
+Fixed problem with @code{UNSIGNED BIGINT} on AIX (again).
+@end itemize
+
+@node News-3.23.52, News-3.23.51, News-3.23.53, News-3.23.x
@appendixsubsec Changes in release 3.23.52
@itemize @bullet
@item
-Fixed problem with @code{UNSIGNED BIGINT} on AIX.
-@item
Fixed security bug when having an empty databasename in the @code{user.db}
table.
@item
diff --git a/include/global.h b/include/global.h
index a6cc561fb0a..8067fe5f38b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -104,9 +104,15 @@
#define _H_STRINGS
#define _SYS_STREAM_H
#define _AIX32_CURSES
-#define longlong2double(A) my_longlong2double(A)
-double my_longlong2double(unsigned long long A);
+#define ulonglong2double(A) my_ulonglong2double(A)
+#ifdef __cplusplus
+extern "C" {
#endif
+double my_ulonglong2double(unsigned long long A);
+#ifdef __cplusplus
+}
+#endif
+#endif /* _AIX */
#ifdef HAVE_BROKEN_SNPRINTF /* HPUX 10.20 don't have this defined */
#undef HAVE_SNPRINTF
diff --git a/mysys/my_port.c b/mysys/my_port.c
index a9778875850..bf5dbcbace1 100644
--- a/mysys/my_port.c
+++ b/mysys/my_port.c
@@ -33,7 +33,7 @@
-double my_longlong2double(unsigned long long nr)
+double my_ulonglong2double(unsigned long long nr)
{
return (double) nr;
}