Partial Watcom C++ 10.6 support added (doesn't link for some reason)

[wxWidgets.git] / include / wx / odbc.h

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index ed73055dedcc1f2d6e03c575b4556b8a26de862f..607bbcfa1855fdaf078a223c646ab619d37b1168 100644 (file)
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -11,23 +11,25 @@
 
 #include "wx/setup.h"
 
-#if USE_ODBC
+#if wxUSE_ODBC
 
 #ifdef __GNUG__
 #pragma interface "odbc.h"
 #endif
 
-#ifndef __ODBCH__
-#define __ODBCH__
+#ifndef _WX_ODBCH__
+#define _WX_ODBCH__
 
 #ifdef __WXMSW__
 #include <windows.h>
 #endif
 
 #ifdef __WXGTK__
+extern "C" {
 #include <../iodbc/postgres/isqlext.h>
 #include <../iodbc/postgres/odbc_funcs.h>
 #include <../iodbc/postgres/odbc_types.h>
+}
 #else
 #include <sqlext.h>
 #endif
@@ -329,4 +331,4 @@ class WXDLLEXPORT wxRecordSet: public wxObject
 
 #endif
 
-#endif  // USE_ODBC
+#endif  // wxUSE_ODBC