fix ndb odbc compile

8 files changed, 9 insertions, 4 deletions

diff --git a/ndb/src/client/odbc/codegen/SimpleParser.cpp b/ndb/src/client/odbc/codegen/SimpleParser.cpp
index 62162172bc8..a2418f49e37 100644
--- a/ndb/src/client/odbc/codegen/SimpleParser.cpp
+++ b/ndb/src/client/odbc/codegen/SimpleParser.cpp
@@ -14,6 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <common/common.hpp>
 #include <NdbMutex.h>
 #include <common/StmtArea.hpp>
 #include <FlexLexer.h>
diff --git a/ndb/src/client/odbc/common/Ctx.cpp b/ndb/src/client/odbc/common/Ctx.cpp
index 44689657788..d6faa5cba77 100644
--- a/ndb/src/client/odbc/common/Ctx.cpp
+++ b/ndb/src/client/odbc/common/Ctx.cpp
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <ndb_global.h>
 #include <NdbApi.hpp>
 #include <common/common.hpp>
 #include "DiagArea.hpp"
diff --git a/ndb/src/client/odbc/common/DataField.cpp b/ndb/src/client/odbc/common/DataField.cpp
index dfd4137ffd9..11aae7d893b 100644
--- a/ndb/src/client/odbc/common/DataField.cpp
+++ b/ndb/src/client/odbc/common/DataField.cpp
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <ndb_global.h>
 #include "DataField.hpp"
 
 #ifndef INT_MAX
diff --git a/ndb/src/client/odbc/common/OdbcData.cpp b/ndb/src/client/odbc/common/OdbcData.cpp
index 2e1bd768aec..32400e07c7a 100644
--- a/ndb/src/client/odbc/common/OdbcData.cpp
+++ b/ndb/src/client/odbc/common/OdbcData.cpp
@@ -14,7 +14,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <ndb_global.h>
 #include "OdbcData.hpp"
 
 OdbcData::OdbcData() :
diff --git a/ndb/src/client/odbc/common/common.hpp b/ndb/src/client/odbc/common/common.hpp
index 6d99aac5455..d2f243b6437 100644
--- a/ndb/src/client/odbc/common/common.hpp
+++ b/ndb/src/client/odbc/common/common.hpp
@@ -17,6 +17,10 @@
 #ifndef ODBC_COMMON_common_hpp
 #define ODBC_COMMON_common_hpp
 
+#define stpcpy stpcpy
+#include <ndb_global.h>
+#undef swap
+
 // misc defs
 
 #ifdef NDB_GCC // only for odbc
diff --git a/ndb/src/client/odbc/handles/PoolNdb.hpp b/ndb/src/client/odbc/handles/PoolNdb.hpp
index bea7e72a59f..35eac055c30 100644
--- a/ndb/src/client/odbc/handles/PoolNdb.hpp
+++ b/ndb/src/client/odbc/handles/PoolNdb.hpp
@@ -17,8 +17,8 @@
 #ifndef ODBC_HANDLES_PoolNdb_hpp
 #define ODBC_HANDLES_PoolNdb_hpp
 
-#include <list>
 #include <common/common.hpp>
+#include <list>
 
 class Ndb;
 
diff --git a/ndb/test/odbc/driver/testOdbcDriver.cpp b/ndb/test/odbc/driver/testOdbcDriver.cpp
index b856b6a21f2..d3b3802ebe1 100644
--- a/ndb/test/odbc/driver/testOdbcDriver.cpp
+++ b/ndb/test/odbc/driver/testOdbcDriver.cpp
@@ -37,6 +37,7 @@
  */
 
 #include <ndb_global.h>
+#undef test
 #include <ndb_version.h>
 #include <kernel/ndb_limits.h>
 #include <Bitmask.hpp>
@@ -1281,6 +1282,7 @@ struct Fld {
 	    return test.verify(m_double, m_ind, fld.m_double, fld.m_ind);
 	}
 	assert(false);
+	return false;
     }
     // debug
     void print() const {
diff --git a/ndb/tools/ndbsql/ndbsql.cpp b/ndb/tools/ndbsql/ndbsql.cpp
index ce73a972f47..33a3e39776a 100644
--- a/ndb/tools/ndbsql/ndbsql.cpp
+++ b/ndb/tools/ndbsql/ndbsql.cpp
@@ -138,6 +138,7 @@ bool emptyString(const char* s) {
  * to obtain the row count.
  */
 #define MAXCOLS 100
+#undef max
 #define max(a,b) ((a)>(b)?(a):(b))
 
 #define MAX_MESSAGE	500