Fix Linux compile error by #define NODW. Modified: plgdbutl.cpp; typo…

… Modified: odbconn.h
MariaDB · Aug 6, 2017 · f5b0993 · f5b0993
1 parent 0387c13
commit f5b0993
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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"