because gcc is dumb and can't tell the difference between a std::string and a wxString

[wxWidgets.git] / src / iodbc / isql.h

diff --git a/src/iodbc/isql.h b/src/iodbc/isql.h
index 5774241d4c0b272a4547f485ed507a1c56f39d39..971a0dc037d23dd5f8c7b74346cd949cdd47dcc5 100644 (file)
--- a/src/iodbc/isql.h
+++ b/src/iodbc/isql.h
@@ -26,6 +26,7 @@
 #ifndef _ISQL_H
 #define _ISQL_H
 
+#ifndef WIN16
 #ifdef WIN32
 #define SQL_API                                __stdcall
 #else
@@ -33,9 +34,13 @@
 #define EXPORT
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
-
+#ifndef __EMX__
 typedef void *HWND;
 #endif
+#endif
+#endif
+
+typedef void *SQLHWND;
 
 typedef unsigned char UCHAR;
 typedef long int SDWORD;
@@ -215,7 +220,7 @@ extern "C"
   RETCODE SQL_API SQLTransact (HENV henv, HDBC hdbc, UWORD fType);
 
 /*
- *  Depreciated ODBC 1.0 function - Use SQLBindParameter
+ *  Deprecated ODBC 1.0 function - Use SQLBindParameter
  */
   RETCODE SQL_API SQLSetParam (HSTMT hstmt, UWORD ipar, SWORD fCType,
       SWORD fSqlType, UDWORD cbColDef, SWORD ibScale, PTR rgbValue,