summaryrefslogtreecommitdiff
path: root/storage/connect/global.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2013-01-28 13:42:14 +0400
committerAlexander Barkov <bar@mnogosearch.org>2013-01-28 13:42:14 +0400
commit4f9e09efb4c7d90fc8d659a4cd9fea2d05b2af8e (patch)
treeb183f22e704bef301803fc365b4a7752c789ed30 /storage/connect/global.h
parent6690bafca90ecd160034f7315d900f7c3f84e622 (diff)
downloadmariadb-git-4f9e09efb4c7d90fc8d659a4cd9fea2d05b2af8e.tar.gz
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
Diffstat (limited to 'storage/connect/global.h')
-rw-r--r--storage/connect/global.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/global.h b/storage/connect/global.h
index acd8b47ae9d..3b8e11d34d5 100644
--- a/storage/connect/global.h
+++ b/storage/connect/global.h
@@ -143,7 +143,7 @@ typedef unsigned char BYTE;
typedef char *LPSTR;
typedef char *PSZ;
#if !defined(NODW)
-typedef int DWORD;
+typedef unsigned int DWORD;
#endif // !NODW
#undef HANDLE
typedef int HANDLE;