From 89e71ffb40e5f58b7ec29c3b74db6a8a9bcc9a20 Mon Sep 17 00:00:00 2001
From: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun, 27 Oct 2013 14:32:54 +0100
Subject: [PATCH] - Fix some GCC compiler eroors and warnings

modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/odbconn.h
---
 storage/connect/ha_connect.cc | 2 +-
 storage/connect/odbconn.cpp   | 2 +-
 storage/connect/odbconn.h     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 4fecbe9be84..a066c48bf0e 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -3734,7 +3734,7 @@ static bool CheckSelf(PGLOBAL g, TABLE_SHARE *s, const char *host,
     return false;
   else if (tab && stricmp(tab, s->table_name.str))
     return false;
-  else if (port && port != GetDefaultPort())
+  else if (port && port != (signed)GetDefaultPort())
     return false;
 
   strcpy(g->Message, "This MySQL table is defined on itself");
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp
index 8dcf71c2953..0a19d90a422 100644
--- a/storage/connect/odbconn.cpp
+++ b/storage/connect/odbconn.cpp
@@ -1113,7 +1113,7 @@ bool ODBConn::Connect(DWORD Options)
   if (hWnd == NULL)
     hWnd = GetDesktopWindow();
 #else   // !WIN32
-  HWND    hWnd = NULL;
+  HWND    hWnd = 1;
 #endif  // !WIN32
   PGLOBAL& g = m_G;
   PDBUSER dup = PlgGetUser(g);
diff --git a/storage/connect/odbconn.h b/storage/connect/odbconn.h
index 311a6ee6406..448ce2d428f 100644
--- a/storage/connect/odbconn.h
+++ b/storage/connect/odbconn.h
@@ -115,7 +115,7 @@ class ODBConn : public BLOCK {
  public:
   ODBConn(PGLOBAL g, TDBODBC *tdbp);
 
-  static enum DOP {               // Db Open oPtions
+  enum DOP {                      // Db Open oPtions
     traceSQL =        0x0001,     // Trace SQL calls
     openReadOnly =    0x0002,     // Open database read only
     useCursorLib =    0x0004,     // Use ODBC cursor lib