diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-06 22:04:14 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-06 22:04:14 +0200 |
| commit | 9e5ca80afe1c126bb974b71c3b3c5ff96f010295 (patch) | |
| tree | 0fc730f92d1c1996476a473b143a2dd8e44b7fab | |
| parent | d66d149f0a24f5c5f326fd3bca4ac91fa938b830 (diff) | |
| download | mariadb-git-9e5ca80afe1c126bb974b71c3b3c5ff96f010295.tar.gz | |
Fix Linux compile error by #define NODW. Modified: plgdbutl.cpp; typo Modified: odbconn.h
| -rw-r--r-- | storage/connect/odbconn.h | 2 | ||||
| -rw-r--r-- | storage/connect/plgdbutl.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/odbconn.h b/storage/connect/odbconn.h index 59bf41d1e81..f98c67bd12f 100644 --- a/storage/connect/odbconn.h +++ b/storage/connect/odbconn.h @@ -105,7 +105,7 @@ class DBX : public BLOCK { class ODBConn : public BLOCK { friend class TDBODBC; friend class DBX; - friend PQRYRES GetColumnInfo(PGLOBAL, char*&, char *, int, PVBLK&); +//friend PQRYRES GetColumnInfo(PGLOBAL, char*&, char *, int, PVBLK&); private: ODBConn(); // Standard (unused) constructor diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp index cdd27cefead..691e6ce1a7d 100644 --- a/storage/connect/plgdbutl.cpp +++ b/storage/connect/plgdbutl.cpp @@ -69,6 +69,7 @@ #include "valblk.h" #include "rcmsg.h" #if defined(ODBC_SUPPORT) +#define NODW // See comment in os.h #include "tabext.h" #include "odbccat.h" #include "tabodbc.h" |