[#1577388] - fix for scaling in wxImage.

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

diff --git a/src/iodbc/isql.h b/src/iodbc/isql.h
index a1f406626dc0b7550911455df57909cac85b7c6c..87b599b47776396a9d409bccd9020f145b9806a6 100644 (file)
--- a/src/iodbc/isql.h
+++ b/src/iodbc/isql.h
@@ -6,8 +6,8 @@
  *  iODBC defines
  *
  *  The iODBC driver manager.
- *  
- *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
@@ -26,6 +26,7 @@
 #ifndef _ISQL_H
 #define _ISQL_H
 
+#ifndef WIN16
 #ifdef WIN32
 #define SQL_API                                __stdcall
 #else
@@ -33,9 +34,11 @@
 #define EXPORT
 #define CALLBACK
 #define SQL_API                                EXPORT CALLBACK
-
+#ifndef __EMX__
 typedef void *HWND;
 #endif
+#endif
+#endif
 
 typedef void *SQLHWND;
 
@@ -44,6 +47,8 @@ typedef long int SDWORD;
 typedef short int SWORD;
 typedef unsigned long int UDWORD;
 typedef unsigned short int UWORD;
+typedef long SQLINTEGER;
+typedef UDWORD SQLUINTEGER;
 
 typedef void FAR *PTR;
 typedef void FAR *HENV;
@@ -217,7 +222,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,