Fixing ODBC related compilation failures:

- without ODBC: adding a few "#ifdef CONNECT_SUPPORT"
- with ODBC on Linux: conflicting definitions for DWORD
  in sql.h (unixODBC) vs global.h.
  Using "typedef unsigned int DWORD", as this is how MS SQK defines it
  and matches unixODBC definition.

Removing sqlutil.h. value.cpp now uses sql.h and sqlext.h instead.


removed:
  storage/connect/sqlutil.h
modified:
  storage/connect/global.h
  storage/connect/value.cpp
  storage/connect/value.h

1 files changed, 4 insertions, 0 deletions

diff --git a/storage/connect/value.h b/storage/connect/value.h
index c1ed3865a5e..7570deb2283 100644
--- a/storage/connect/value.h
+++ b/storage/connect/value.h
@@ -39,14 +39,18 @@ typedef struct _datpar *PDTP;         // For DTVAL
 /*  Utilities used to test types and to allocated values.              */

 /***********************************************************************/

 int   GetPLGType(int);

+#ifdef ODBC_SUPPORT

 short GetSQLType(int);

 int   GetSQLCType(int);

+#endif

 PVAL  AllocateValue(PGLOBAL, void *, short);

 

 // Exported functions

 DllExport PSZ   GetTypeName(int);

 DllExport int   GetTypeSize(int, int);

+#ifdef ODBC_SUPPORT

 DllExport int   TranslateSQLType(int stp, int prec, int& len);

+#endif

 DllExport char *GetFormatType(int);

 DllExport int   GetFormatType(char);

 DllExport int   GetDBType(int);