summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--storage/connect/odbconn.h2
-rw-r--r--storage/connect/plgdbutl.cpp1
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"