summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-08-12 03:28:02 +0300
committermonty@hundin.mysql.fi <>2002-08-12 03:28:02 +0300
commitb779b63862990857c2dd0456196529364ff02d1a (patch)
tree34d4d5eb2aef4b99d0518f461da41a331af8574e /include
parent0005f28b4ec6fdc73c83ea430f53f74103b26239 (diff)
downloadmariadb-git-b779b63862990857c2dd0456196529364ff02d1a.tar.gz
Fixed problem with BIGINT and shutdown on AIX
Moved IF(test,column,NULL) code to 4.0 Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h. Removed some CR's in os2 files.
Diffstat (limited to 'include')
-rw-r--r--include/global.h2
-rw-r--r--include/my_no_pthread.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h
index 61e00df375d..a6cc561fb0a 100644
--- a/include/global.h
+++ b/include/global.h
@@ -104,6 +104,8 @@
#define _H_STRINGS
#define _SYS_STREAM_H
#define _AIX32_CURSES
+#define longlong2double(A) my_longlong2double(A)
+double my_longlong2double(unsigned long long A);
#endif
#ifdef HAVE_BROKEN_SNPRINTF /* HPUX 10.20 don't have this defined */
diff --git a/include/my_no_pthread.h b/include/my_no_pthread.h
index 2ff8896fa74..328086ec388 100644
--- a/include/my_no_pthread.h
+++ b/include/my_no_pthread.h
@@ -21,7 +21,7 @@
environment, easier to use.
*/
-#if !defined(_my_no_pthread_h) && !defined(THREADS)
+#if !defined(_my_no_pthread_h) && !defined(THREAD)
#define _my_no_pthread_h
#define pthread_mutex_init(A,B)