Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong).

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

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"

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                          */

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>

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__)

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>