file which undefs symbols ocnflicting with windows.h

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

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index 58d027a0839f890551ef3f416bca88c1b4208360..90fcbaea0c919fc71e83e0e6e4eeb5c3c53ff887 100644 (file)
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -11,24 +11,29 @@
 
 #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>
+#include <../iodbc/isql.h>
+#include <../iodbc/isqlext.h>
+#include <../iodbc/odbc_funcs.h>
+#include <../iodbc/odbc_types.h>
+typedef float   SFLOAT;
+typedef double  SDOUBLE;
+#define ULONG UDWORD
 }
 #else
 #include <sqlext.h>
@@ -78,7 +83,7 @@ class WXDLLEXPORT wxDatabase: public wxObject
   bool err_occured;
 
   wxList recordSets; // Record sets: Added by JACS
-
+  
  public:
   wxDatabase(void);
   ~wxDatabase(void);
@@ -331,4 +336,4 @@ class WXDLLEXPORT wxRecordSet: public wxObject
 
 #endif
 
-#endif  // USE_ODBC
+#endif  // wxUSE_ODBC