diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-01-30 00:15:54 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-01-30 00:15:54 +0100 |
| commit | 29df840a11407a9a4c3ba47512f05c93d9b5e086 (patch) | |
| tree | 436e57683cd97313ac93105a60bcd55d68a0ee28 | |
| parent | 74b51d952561bd0c2e5c0fc5785e7888d148e109 (diff) | |
| parent | c87004d81798c2dfe4bc5ac738dc6de66072118c (diff) | |
| download | mariadb-git-29df840a11407a9a4c3ba47512f05c93d9b5e086.tar.gz | |
Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong).
| -rw-r--r-- | storage/connect/fmdlex.c | 1 | ||||
| -rw-r--r-- | storage/connect/maputil.cpp | 1 | ||||
| -rw-r--r-- | storage/connect/tabcol.cpp | 6 | ||||
| -rw-r--r-- | storage/connect/tabfmt.cpp | 5 | ||||
| -rw-r--r-- | storage/connect/tabmul.cpp | 4 | ||||
| -rw-r--r-- | storage/connect/tabmysql.cpp | 1 |
6 files changed, 4 insertions, 14 deletions
diff --git a/storage/connect/fmdlex.c b/storage/connect/fmdlex.c index 14a7c34ccf9..b2ee06f9362 100644 --- a/storage/connect/fmdlex.c +++ b/storage/connect/fmdlex.c @@ -392,7 +392,6 @@ char *yytext; #include <io.h>
#endif /* UNIX */
#include <string.h>
-#include "os2def.h"
#include "preparse.h"
#define isatty _isatty
diff --git a/storage/connect/maputil.cpp b/storage/connect/maputil.cpp index 5bd45b07a28..6f824e4cdda 100644 --- a/storage/connect/maputil.cpp +++ b/storage/connect/maputil.cpp @@ -3,7 +3,6 @@ #include "osutil.h"
#include <errno.h>
#include <stddef.h>
-//typedef int HANDLE; done in os2def.h
#else /* WINDOWS */
//#include <windows.h>
#include "osutil.h"
diff --git a/storage/connect/tabcol.cpp b/storage/connect/tabcol.cpp index 4bbc78cc3ac..d0ec538bb8b 100644 --- a/storage/connect/tabcol.cpp +++ b/storage/connect/tabcol.cpp @@ -7,13 +7,9 @@ /***********************************************************************/
/***********************************************************************/
-/* Include relevant MariaDB header file. */
+/* Include relevant MariaDB header file. */
/***********************************************************************/
-#if defined(OS16) || defined(OS32)
-#include <os2def.h>
-#else
#include "my_global.h"
-#endif
/***********************************************************************/
/* Include required application header files */
diff --git a/storage/connect/tabfmt.cpp b/storage/connect/tabfmt.cpp index 3d2b182938a..4660de932ed 100644 --- a/storage/connect/tabfmt.cpp +++ b/storage/connect/tabfmt.cpp @@ -19,9 +19,8 @@ /* Include relevant MariaDB header file. */
/***********************************************************************/
#include "my_global.h"
-#if defined(OS16) || defined(OS32)
-#include <os2def.h>
-#elif defined(WIN32)
+
+#if defined(WIN32)
#include <io.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/storage/connect/tabmul.cpp b/storage/connect/tabmul.cpp index c60eb4ff689..21fdba42d3d 100644 --- a/storage/connect/tabmul.cpp +++ b/storage/connect/tabmul.cpp @@ -37,9 +37,7 @@ /* Include relevant section of system dependant header files. */
/***********************************************************************/
#include "my_global.h"
-#if defined(OS16) || defined(OS32)
-#include <os2def.h>
-#elif defined(WIN32)
+#if defined(WIN32)
#include <stdlib.h>
#include <stdio.h>
#if defined(__BORLANDC__)
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index 686c6b666b3..859989fae34 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -40,7 +40,6 @@ #include <stdlib.h>
#include <stdio.h>
#include <string.h>
-//#include "os2def.h"
#include "osutil.h"
//#include <io.h>
//#include <fcntl.h>
|