X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a6944fd74cfb70ace96d60bde31a7c8e0a5896d..1b826605f5ab0bb680925f5e24a57b068ce2bdc5:/include/wx/odbc.h

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index ed73055ded..607bbcfa18 100644
--- 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