X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96820af7cb5584b3d1791001db67d4f2a092466b..bde626ce30c80dd9409b7214f43e92c0f62447a0:/include/wx/isql.h

diff --git a/include/wx/isql.h b/include/wx/isql.h
index e971f02468..3ddfdaf70a 100644
--- a/include/wx/isql.h
+++ b/include/wx/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,28 +26,32 @@
 #ifndef _ISQL_H
 #define _ISQL_H
 
-#if defined(__WIN16__)
+#if defined(WIN32)
+#define SQL_API                 __stdcall
 
-#define SQL_API EXPORT CALLBACK
-#ifndef EXPORT
-#define EXPORT _export
+#ifndef FAR
+#define FAR
 #endif
 
-#elif defined(WIN32)
-#define SQL_API				__stdcall
+#elif defined(__OS2__)
+#define SQL_API                 _Optlink
 
-#ifndef FAR  
-#define FAR 
+#ifndef FAR
+#define FAR
+#define EXPORT
+#define CALLBACK
 #endif
 
 #else
 #define FAR
 #define EXPORT
 #define CALLBACK
-#define SQL_API				EXPORT CALLBACK
+#define SQL_API                 EXPORT CALLBACK
 
+#ifndef __EMX__
 typedef void *HWND;
 #endif
+#endif
 
 typedef void *SQLHWND;
 
@@ -56,6 +60,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;
@@ -63,126 +69,126 @@ typedef void FAR *HDBC;
 typedef void FAR *HSTMT;
 
 typedef signed short RETCODE;
-#define SQLRETURN	RETCODE
+#define SQLRETURN RETCODE
 
 
-#define ODBCVER				0x0250
+#define ODBCVER                 0x0250
 
-#define SQL_MAX_MESSAGE_LENGTH		512
-#define SQL_MAX_DSN_LENGTH		32
+#define SQL_MAX_MESSAGE_LENGTH  512
+#define SQL_MAX_DSN_LENGTH      32
 
 /*
  *  Function return codes
  */
-#define SQL_INVALID_HANDLE		(-2)
-#define SQL_ERROR			(-1)
-#define SQL_SUCCESS 			0
-#define SQL_SUCCESS_WITH_INFO		1
-#define SQL_NO_DATA_FOUND		100
+#define SQL_INVALID_HANDLE      (-2)
+#define SQL_ERROR               (-1)
+#define SQL_SUCCESS             0
+#define SQL_SUCCESS_WITH_INFO   1
+#define SQL_NO_DATA_FOUND       100
 
 /*
  *  Standard SQL datatypes, using ANSI type numbering
  */
-#define SQL_CHAR			1
-#define SQL_NUMERIC 			2
-#define SQL_DECIMAL 			3
-#define SQL_INTEGER 			4
-#define SQL_SMALLINT			5
-#define SQL_FLOAT			6
-#define SQL_REAL			7
-#define SQL_DOUBLE			8
-#define SQL_VARCHAR 			12
-
-#define SQL_TYPE_MIN			SQL_CHAR
-#define SQL_TYPE_NULL			0
-#define SQL_TYPE_MAX			SQL_VARCHAR
+#define SQL_CHAR                1
+#define SQL_NUMERIC             2
+#define SQL_DECIMAL             3
+#define SQL_INTEGER             4
+#define SQL_SMALLINT            5
+#define SQL_FLOAT               6
+#define SQL_REAL                7
+#define SQL_DOUBLE              8
+#define SQL_VARCHAR             12
+
+#define SQL_TYPE_MIN            SQL_CHAR
+#define SQL_TYPE_NULL           0
+#define SQL_TYPE_MAX            SQL_VARCHAR
 
 /*
  *  C datatype to SQL datatype mapping
  */
-#define SQL_C_CHAR			SQL_CHAR
-#define SQL_C_LONG			SQL_INTEGER
-#define SQL_C_SHORT			SQL_SMALLINT
-#define SQL_C_FLOAT			SQL_REAL
-#define SQL_C_DOUBLE			SQL_DOUBLE
-#define SQL_C_DEFAULT 			99
+#define SQL_C_CHAR              SQL_CHAR
+#define SQL_C_LONG              SQL_INTEGER
+#define SQL_C_SHORT             SQL_SMALLINT
+#define SQL_C_FLOAT             SQL_REAL
+#define SQL_C_DOUBLE            SQL_DOUBLE
+#define SQL_C_DEFAULT           99
 
 /*
  *  NULL status constants.
  */
-#define SQL_NO_NULLS			0
-#define SQL_NULLABLE			1
-#define SQL_NULLABLE_UNKNOWN		2
+#define SQL_NO_NULLS            0
+#define SQL_NULLABLE            1
+#define SQL_NULLABLE_UNKNOWN    2
 
 /*
  *  Special length values
  */
-#define SQL_NULL_DATA			(-1)
-#define SQL_DATA_AT_EXEC		(-2)
-#define SQL_NTS 			(-3)
+#define SQL_NULL_DATA           (-1)
+#define SQL_DATA_AT_EXEC        (-2)
+#define SQL_NTS                 (-3)
 
 /*
  *  SQLFreeStmt
  */
-#define SQL_CLOSE			0
-#define SQL_DROP			1
-#define SQL_UNBIND			2
-#define SQL_RESET_PARAMS		3
+#define SQL_CLOSE               0
+#define SQL_DROP                1
+#define SQL_UNBIND              2
+#define SQL_RESET_PARAMS        3
 
 /*
  *  SQLTransact
  */
-#define SQL_COMMIT			0
-#define SQL_ROLLBACK			1
+#define SQL_COMMIT              0
+#define SQL_ROLLBACK            1
 
 /*
  *  SQLColAttributes
  */
-#define SQL_COLUMN_COUNT		0
-#define SQL_COLUMN_NAME			1
-#define SQL_COLUMN_TYPE			2
-#define SQL_COLUMN_LENGTH		3
-#define SQL_COLUMN_PRECISION		4
-#define SQL_COLUMN_SCALE		5
-#define SQL_COLUMN_DISPLAY_SIZE		6
-#define SQL_COLUMN_NULLABLE		7
-#define SQL_COLUMN_UNSIGNED		8
-#define SQL_COLUMN_MONEY		9
-#define SQL_COLUMN_UPDATABLE		10
-#define SQL_COLUMN_AUTO_INCREMENT	11
-#define SQL_COLUMN_CASE_SENSITIVE	12
-#define SQL_COLUMN_SEARCHABLE		13
-#define SQL_COLUMN_TYPE_NAME		14
-#define SQL_COLUMN_TABLE_NAME		15
-#define SQL_COLUMN_OWNER_NAME		16
-#define SQL_COLUMN_QUALIFIER_NAME	17
-#define SQL_COLUMN_LABEL		18
-
-#define SQL_COLATT_OPT_MAX		SQL_COLUMN_LABEL
-#define	SQL_COLATT_OPT_MIN		SQL_COLUMN_COUNT
-#define SQL_COLUMN_DRIVER_START		1000
+#define SQL_COLUMN_COUNT                0
+#define SQL_COLUMN_NAME                 1
+#define SQL_COLUMN_TYPE                 2
+#define SQL_COLUMN_LENGTH               3
+#define SQL_COLUMN_PRECISION            4
+#define SQL_COLUMN_SCALE                5
+#define SQL_COLUMN_DISPLAY_SIZE         6
+#define SQL_COLUMN_NULLABLE             7
+#define SQL_COLUMN_UNSIGNED             8
+#define SQL_COLUMN_MONEY                9
+#define SQL_COLUMN_UPDATABLE            10
+#define SQL_COLUMN_AUTO_INCREMENT       11
+#define SQL_COLUMN_CASE_SENSITIVE       12
+#define SQL_COLUMN_SEARCHABLE           13
+#define SQL_COLUMN_TYPE_NAME            14
+#define SQL_COLUMN_TABLE_NAME           15
+#define SQL_COLUMN_OWNER_NAME           16
+#define SQL_COLUMN_QUALIFIER_NAME       17
+#define SQL_COLUMN_LABEL                18
+
+#define SQL_COLATT_OPT_MAX      SQL_COLUMN_LABEL
+#define SQL_COLATT_OPT_MIN      SQL_COLUMN_COUNT
+#define SQL_COLUMN_DRIVER_START 1000
 
 /*
  *  SQLColAttributes : SQL_COLUMN_UPDATABLE
  */
-#define SQL_ATTR_READONLY		0
-#define SQL_ATTR_WRITE			1
-#define SQL_ATTR_READWRITE_UNKNOWN	2
+#define SQL_ATTR_READONLY           0
+#define SQL_ATTR_WRITE              1
+#define SQL_ATTR_READWRITE_UNKNOWN  2
 
 /*
  *  SQLColAttributes : SQL_COLUMN_SEARCHABLE
  */
-#define SQL_UNSEARCHABLE		0
-#define SQL_LIKE_ONLY			1
-#define SQL_ALL_EXCEPT_LIKE 		2
-#define SQL_SEARCHABLE			3
+#define SQL_UNSEARCHABLE        0
+#define SQL_LIKE_ONLY           1
+#define SQL_ALL_EXCEPT_LIKE     2
+#define SQL_SEARCHABLE          3
 
 /*
  *  NULL Handles
  */
-#define SQL_NULL_HENV			0
-#define SQL_NULL_HDBC			0
-#define SQL_NULL_HSTMT			0
+#define SQL_NULL_HENV           0
+#define SQL_NULL_HDBC           0
+#define SQL_NULL_HSTMT          0
 
 
 /*
@@ -229,7 +235,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,