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 9309ca6a898b80a66ad61b6279bba5676512dc33..971a0dc037d23dd5f8c7b74346cd949cdd47dcc5 100644 (file)
--- a/src/iodbc/isql.h
+++ b/src/iodbc/isql.h
@@ -34,10 +34,11 @@
 #define EXPORT
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
-
+#ifndef __EMX__
 typedef void *HWND;
 #endif
 #endif
+#endif
 
 typedef void *SQLHWND;
 
@@ -219,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,