* Apply Danny Smith patch 102446

	2000-11-20  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
	* include/sql.h (ODBCVER): change default to 0x0351.
	(SQLSetScrollOptions): non-core function, move prototype to sqlext.h.
	(SQLColAttributes): likewise.
	(SQLBindParam): add prototype for ODBC 3.x function.
	(SQLCloseCursor): likewise.
	(SQLColAttribute): likewise.
	(SQLCopyDesc):likewise.
	(SQLEndTran): likewise.
	(SQLFetchScroll): likewise.
	(SQLGetConnectAttr): likewise.
	(SQLGetDescField): likewise.
	(SQLGetDescRec): likewise.
	(SQLGetDiagField): likewise.
	(SQLGetDiagRec): likewise.
	(SQLGetEnvAttr): likewise.
	(SQLGetStmtAttr): likewise.
	(SQLSetConnectAttr): likewise.
	(SQLSetDescField):likewise.
	(SQLSetDescRec): likewise.
	(SQLSetEnvAttr): likewise.
	(SQLSetStmtAttr): likewise.
	(SQLINTENGER and SQLUINTEGER): replace with SQLLEN and SQLULEN for
	_WIN64 compatability;
	(SQL_ACCESS_MODE): Move define to sqlext.h (used in non-core functions).
	(SQL_ACTIVE_CONNECTIONS): likewise.
	(SQL_ACTIVE_STATEMENTS): likewise.
	(SQL_ALL_EXCEPT_LIKE): likewise.
	(SQL_API_ALL_FUNCTIONS): likewise.
	(SQL_API_LOADBYORDINAL): likewise.
	(SQL_API_SQLBINDPARAMETER): likewise.
	(SQL_API_SQLBROWSECONNECT): likewise.
	(SQL_API_SQLCOLATTRIBUTES): likewise.
	(SQL_API_SQLCOLUMNPRIVILEGES): likewise.
	(SQL_API_SQLDESCRIBEPARAM): likewise.
	(SQL_API_SQLDRIVERCONNECT): likewise.
	(SQL_API_SQLDRIVERS): likewise.
	(SQL_API_SQLEXTENDEDFETCH): likewise.
	(SQL_API_SQLFOREIGNKEYS): likewise.
	(SQL_API_SQLMORERESULTS): likewise.
	(SQL_API_SQLNATIVESQL): likewise.
	(SQL_API_SQLNUMPARAMS): likewise.
	(SQL_API_SQLPARAMOPTIONS): likewise.
	(SQL_API_SQLPRIMARYKEYS): likewise.
	(SQL_API_SQLPROCEDURECOLUMNS): likewise.
	(SQL_API_SQLPROCEDURES): likewise.
	(SQL_API_SQLSETPOS): likewise.
	(SQL_API_SQLSETSCROLLOPTIONS): likewise.
	(SQL_API_SQLTABLEPRIVILEGES): likewise.
	(SQL_ASYNC_ENABLE): likewise.
	(SQL_ASYNC_ENABLE_DEFAULT): likewise.
	(SQL_ASYNC_ENABLE_OFF): likewise.
	(SQL_ASYNC_ENABLE_ON): likewise.
	(SQL_ATTR_READONLY): likewise.
	(SQL_ATTR_READWRITE_UNKNOWN): likewise.
	(SQL_ATTR_WRITE): likewise.
	(SQL_AUTOCOMMIT): likewise.
	(SQL_AUTOCOMMIT_DEFAULT): likewise.
	(SQL_AUTOCOMMIT_OFF): likewise.
	(SQL_AUTOCOMMIT_ON): likewise.
	(SQL_BEST_ROWID): likewise.
	(SQL_BIGINT): likewise.
	(SQL_BINARY): likewise.
	(SQL_BIND_BY_COLUMN): likewise.
	(SQL_BIND_TYPE): likewise.
	(SQL_BIND_TYPE_DEFAULT): likewise.
	(SQL_BIT): likewise.
	(SQL_BOOKMARK_PERSISTENCE): likewise.
	(SQL_BP_CLOSE): likewise.
	(SQL_BP_DELETE): likewise.
	(SQL_BP_DROP): likewise.
	(SQL_BP_OTHER_HSTMT): likewise.
	(SQL_BP_SCROLL): likewise.
	(SQL_BP_TRANSACTION): likewise.
	(SQL_BP_UPDATE): likewise.
	(SQL_C_BINARY): likewise.
	(SQL_C_BIT): likewise.
	(SQL_C_BOOKMARK): likewise.
	(SQL_C_CHAR): likewise.
	(SQL_C_DATE): likewise.
	(SQL_C_DEFAULT): likewise.
	(SQL_C_DOUBLE): likewise.
	(SQL_C_FLOAT): likewise.
	(SQL_C_LONG): likewise.
	(SQL_C_SHORT): likewise.
	(SQL_C_SLONG): likewise.
	(SQL_C_SSHORT): likewise.
	(SQL_C_STINYINT): likewise.
	(SQL_C_TIME): likewise.
	(SQL_C_TIMESTAMP): likewise.
	(SQL_C_TINYINT): likewise.
	(SQL_C_ULONG): likewise.
	(SQL_C_USHORT): likewise.
	(SQL_C_UTINYINT): likewise.
	(SQL_CB_NON_NULL): likewise.
	(SQL_CB_NULL): likewise.
	(SQL_CC_CLOSE): likewise.
	(SQL_CC_DELETE): likewise.
	(SQL_CC_PRESERVE): likewise.
	(SQL_CN_ANY): likewise.
	(SQL_CN_DIFFERENT): likewise.
	(SQL_CN_NONE): likewise.
	(SQL_COLATT_OPT_MAX): likewise.
	(SQL_COLATT_OPT_MIN): likewise.
	(SQL_COLUMN_ALIAS): likewise.
	(SQL_COLUMN_AUTO_INCREMENT): likewise.
	(SQL_COLUMN_CASE_SENSITIVE): likewise.
	(SQL_COLUMN_COUNT): likewise.
	(SQL_COLUMN_DISPLAY_SIZE): likewise.
	(SQL_COLUMN_DRIVER_START): likewise.
	(SQL_COLUMN_LABEL): likewise.
	(SQL_COLUMN_LENGTH): likewise.
	(SQL_COLUMN_MONEY): likewise.
	(SQL_COLUMN_NAME): likewise.
	(SQL_COLUMN_NULLABLE): likewise.
	(SQL_COLUMN_OWNER_NAME): likewise.
	(SQL_COLUMN_PRECISION): likewise.
	(SQL_COLUMN_QUALIFIER_NAME): likewise.
	(SQL_COLUMN_SCALE): likewise.
	(SQL_COLUMN_SEARCHABLE): likewise.
	(SQL_COLUMN_TABLE_NAME): likewise.
	(SQL_COLUMN_TYPE): likewise.
	(SQL_COLUMN_TYPE_NAME): likewise.
	(SQL_COLUMN_UNSIGNED): likewise.
	(SQL_COLUMN_UPDATABLE): likewise.
	(SQL_CONCAT_NULL_BEHAVIOR): likewise.
	(SQL_CONCUR_DEFAULT): likewise.
	(SQL_CONCUR_LOCK): likewise.
	(SQL_CONCUR_READ_ONLY): likewise.
	(SQL_CONCUR_ROWVER): likewise.
	(SQL_CONCUR_TIMESTAMP): likewise.
	(SQL_CONCUR_VALUES): likewise.
	(SQL_CONCURRENCY): likewise.
	(SQL_CONN_OPT_MAX): likewise.
	(SQL_CONN_OPT_MIN): likewise.
	(SQL_CONNECT_OPT_DRVR_START): likewise.
	(SQL_CONVERT_BIGINT): likewise.
	(SQL_CONVERT_BINARY): likewise.
	(SQL_CONVERT_BIT): likewise.
	(SQL_CONVERT_CHAR): likewise.
	(SQL_CONVERT_DATE): likewise.
	(SQL_CONVERT_DECIMAL): likewise.
	(SQL_CONVERT_DOUBLE): likewise.
	(SQL_CONVERT_FLOAT): likewise.
	(SQL_CONVERT_FUNCTIONS): likewise.
	(SQL_CONVERT_INTEGER): likewise.
	(SQL_CONVERT_LONGVARBINARY): likewise.
	(SQL_CONVERT_LONGVARCHAR): likewise.
	(SQL_CONVERT_NUMERIC): likewise.
	(SQL_CONVERT_REAL): likewise.
	(SQL_CONVERT_SMALLINT): likewise.
	(SQL_CONVERT_TIME): likewise.
	(SQL_CONVERT_TIMESTAMP): likewise.
	(SQL_CONVERT_TINYINT): likewise.
	(SQL_CONVERT_VARBINARY): likewise.
	(SQL_CONVERT_VARCHAR): likewise.
	(SQL_CORRELATION_NAME): likewise.
	(SQL_CR_CLOSE): likewise.
	(SQL_CR_DELETE): likewise.
	(SQL_CR_PRESERVE): likewise.
	(SQL_CUR_DEFAULT): likewise.
	(SQL_CUR_USE_DRIVER): likewise.
	(SQL_CUR_USE_IF_NEEDED): likewise.
	(SQL_CUR_USE_ODBC): likewise.
	(SQL_CURRENT_QUALIFIER): likewise.
	(SQL_CURSOR_DYNAMIC): likewise.
	(SQL_CURSOR_FORWARD_ONLY): likewise.
	(SQL_CURSOR_KEYSET_DRIVEN): likewise.
	(SQL_CURSOR_ROLLBACK_BEHAVIOR): likewise.
	(SQL_CURSOR_STATIC): likewise.
	(SQL_CURSOR_TYPE): likewise.
	(SQL_CURSOR_TYPE_DEFAULT): likewise.
	(SQL_CVT_BIGINT): likewise.
	(SQL_CVT_BINARY): likewise.
	(SQL_CVT_BIT): likewise.
	(SQL_CVT_CHAR): likewise.
	(SQL_CVT_DATE): likewise.
	(SQL_CVT_DECIMAL): likewise.
	(SQL_CVT_DOUBLE): likewise.
	(SQL_CVT_FLOAT): likewise.
	(SQL_CVT_INTEGER): likewise.
	(SQL_CVT_LONGVARBINARY): likewise.
	(SQL_CVT_LONGVARCHAR): likewise.
	(SQL_CVT_NUMERIC): likewise.
	(SQL_CVT_REAL): likewise.
	(SQL_CVT_SMALLINT): likewise.
	(SQL_CVT_TIME): likewise.
	(SQL_CVT_TIMESTAMP): likewise.
	(SQL_CVT_TINYINT): likewise.
	(SQL_CVT_VARBINARY): likewise.
	(SQL_CVT_VARCHAR): likewise.
	(SQL_DATABASE_NAME): likewise.
	(SQL_DATE): likewise.
	(SQL_DRIVER_HDBC): likewise.
	(SQL_DRIVER_HENV): likewise.
	(SQL_DRIVER_HLIB): likewise.
	(SQL_DRIVER_HSTMT): likewise.
	(SQL_DRIVER_NAME): likewise.
	(SQL_DRIVER_ODBC_VER): likewise.
	(SQL_DRIVER_VER): likewise.
	(SQL_ENSURE): likewise.
	(SQL_EXPRESSIONS_IN_ORDERBY): likewise.
	(SQL_EXT_API_LAST): likewise.
	(SQL_EXT_API_START): likewise.
	(SQL_FD_FETCH_BOOKMARK): likewise.
	(SQL_FD_FETCH_PREV): likewise.
	(SQL_FD_FETCH_RESUME): likewise.
	(SQL_FETCH_PREV): likewise.
	(SQL_FETCH_RESUME): likewise.
	(SQL_FILE_NOT_SUPPORTED): likewise.
	(SQL_FILE_QUALIFIER): likewise.
	(SQL_FILE_TABLE): likewise.
	(SQL_FILE_USAGE): likewise.
	(SQL_FN_CVT_CONVERT): likewise.
	(SQL_FN_NUM_ABS): likewise.
	(SQL_FN_NUM_ACOS): likewise.
	(SQL_FN_NUM_ASIN): likewise.
	(SQL_FN_NUM_ATAN): likewise.
	(SQL_FN_NUM_ATAN2): likewise.
	(SQL_FN_NUM_CEILING): likewise.
	(SQL_FN_NUM_COS): likewise.
	(SQL_FN_NUM_COT): likewise.
	(SQL_FN_NUM_DEGREES): likewise.
	(SQL_FN_NUM_EXP): likewise.
	(SQL_FN_NUM_FLOOR): likewise.
	(SQL_FN_NUM_LOG): likewise.
	(SQL_FN_NUM_LOG10): likewise.
	(SQL_FN_NUM_MOD): likewise.
	(SQL_FN_NUM_PI): likewise.
	(SQL_FN_NUM_POWER): likewise.
	(SQL_FN_NUM_RADIANS): likewise.
	(SQL_FN_NUM_RAND): likewise.
	(SQL_FN_NUM_ROUND): likewise.
	(SQL_FN_NUM_SIGN): likewise.
	(SQL_FN_NUM_SIN): likewise.
	(SQL_FN_NUM_SQRT): likewise.
	(SQL_FN_NUM_TAN): likewise.
	(SQL_FN_NUM_TRUNCATE): likewise.
	(SQL_FN_STR_ASCII): likewise.
	(SQL_FN_STR_CHAR): likewise.
	(SQL_FN_STR_CONCAT): likewise.
	(SQL_FN_STR_DIFFERENCE): likewise.
	(SQL_FN_STR_INSERT): likewise.
	(SQL_FN_STR_LCASE): likewise.
	(SQL_FN_STR_LEFT): likewise.
	(SQL_FN_STR_LENGTH): likewise.
	(SQL_FN_STR_LOCATE): likewise.
	(SQL_FN_STR_LOCATE_2): likewise.
	(SQL_FN_STR_LTRIM): likewise.
	(SQL_FN_STR_REPEAT): likewise.
	(SQL_FN_STR_REPLACE): likewise.
	(SQL_FN_STR_RIGHT): likewise.
	(SQL_FN_STR_RTRIM): likewise.
	(SQL_FN_STR_SOUNDEX): likewise.
	(SQL_FN_STR_SPACE): likewise.
	(SQL_FN_STR_SUBSTRING): likewise.
	(SQL_FN_STR_UCASE): likewise.
	(SQL_FN_SYS_DBNAME): likewise.
	(SQL_FN_SYS_IFNULL): likewise.
	(SQL_FN_SYS_USERNAME): likewise.
	(SQL_FN_TD_CURDATE): likewise.
	(SQL_FN_TD_CURTIME): likewise.
	(SQL_FN_TD_DAYNAME): likewise.
	(SQL_FN_TD_DAYOFMONTH): likewise.
	(SQL_FN_TD_DAYOFWEEK): likewise.
	(SQL_FN_TD_DAYOFYEAR): likewise.
	(SQL_FN_TD_HOUR): likewise.
	(SQL_FN_TD_MINUTE): likewise.
	(SQL_FN_TD_MONTH): likewise.
	(SQL_FN_TD_MONTHNAME): likewise.
	(SQL_FN_TD_NOW): likewise.
	(SQL_FN_TD_QUARTER): likewise.
	(SQL_FN_TD_SECOND): likewise.
	(SQL_FN_TD_TIMESTAMPadd): likewise.
	(SQL_FN_TD_TIMESTAMPDIFF): likewise.
	(SQL_FN_TD_WEEK): likewise.
	(SQL_FN_TD_YEAR): likewise.
	(SQL_FN_TSI_DAY): likewise.
	(SQL_FN_TSI_FRAC_SECOND): likewise.
	(SQL_FN_TSI_HOUR): likewise.
	(SQL_FN_TSI_MINUTE): likewise.
	(SQL_FN_TSI_MONTH): likewise.
	(SQL_FN_TSI_QUARTER): likewise.
	(SQL_FN_TSI_SECOND): likewise.
	(SQL_FN_TSI_WEEK): likewise.
	(SQL_FN_TSI_YEAR): likewise.
	(SQL_GB_GROUP_BY_CONTAINS_SELECT): likewise.
	(SQL_GB_GROUP_BY_EQUALS_SELECT): likewise.
	(SQL_GB_NO_RELATION): likewise.
	(SQL_GB_NOT_SUPPORTED): likewise.
	(SQL_GD_BLOCK): likewise.
	(SQL_GD_BOUND): likewise.
	(SQL_GET_BOOKMARK): likewise.
	(SQL_GROUP_BY): likewise.
	(SQL_INFO_DRIVER_START): likewise.
	(SQL_INFO_FIRST): likewise.
	(SQL_INFO_LAST): likewise.
	(SQL_INTERVAL_DAY): likewise.
	(SQL_INTERVAL_DAY_TO_HOUR): likewise.
	(SQL_INTERVAL_DAY_TO_MINUTE): likewise.
	(SQL_INTERVAL_DAY_TO_SECOND): likewise.
	(SQL_INTERVAL_HOUR): likewise.
	(SQL_INTERVAL_HOUR_TO_MINUTE): likewise.
	(SQL_INTERVAL_HOUR_TO_SECOND): likewise.
	(SQL_INTERVAL_MINUTE): likewise.
	(SQL_INTERVAL_MINUTE_TO_SECOND): likewise.
	(SQL_INTERVAL_MONTH): likewise.
	(SQL_INTERVAL_SECOND): likewise.
	(SQL_INTERVAL_YEAR): likewise.
	(SQL_INTERVAL_YEAR_TO_MONTH): likewise.
	(SQL_KEYSET_SIZE): likewise.
	(SQL_KEYSET_SIZE_DEFAULT): likewise.
	(SQL_KEYWORDS): likewise.
	(SQL_LCK_EXCLUSIVE): likewise.
	(SQL_LCK_NO_CHANGE): likewise.
	(SQL_LCK_UNLOCK): likewise.
	(SQL_LIKE_ESCAPE_CLAUSE): likewise.
	(SQL_LIKE_ONLY): likewise.
	(SQL_LOCK_TYPES): likewise.
	(SQL_LOGIN_TIMEOUT): likewise.
	(SQL_LOGIN_TIMEOUT_DEFAULT): likewise.
	(SQL_LONGVARBINARY): likewise.
	(SQL_LONGVARCHAR): likewise.
	(SQL_MAX_BINARY_LITERAL_LEN): likewise.
	(SQL_MAX_CHAR_LITERAL_LEN): likewise.
	(SQL_MAX_DSN_LENGTH): likewise.
	(SQL_MAX_LENGTH): likewise.
	(SQL_MAX_LENGTH_DEFAULT): likewise.
	(SQL_MAX_OPTION_STRING_LENGTH): likewise.
	(SQL_MAX_OWNER_NAME_LEN): likewise.
	(SQL_MAX_PROCEDURE_NAME_LEN): likewise.
	(SQL_MAX_QUALIFIER_NAME_LEN): likewise.
	(SQL_MAX_ROW_SIZE_INCLUDES_LONG): likewise.
	(SQL_MAX_ROWS): likewise.
	(SQL_MAX_ROWS_DEFAULT): likewise.
	(SQL_MODE_DEFAULT): likewise.
	(SQL_MODE_READ_ONLY): likewise.
	(SQL_MODE_READ_WRITE): likewise.
	(SQL_MULT_RESULT_SETS): likewise.
	(SQL_MULTIPLE_ACTIVE_TXN): likewise.
	(SQL_NC_END): likewise.
	(SQL_NC_START): likewise.
	(SQL_NEED_LONG_DATA_LEN): likewise.
	(SQL_NNC_NON_NULL): likewise.
	(SQL_NNC_NULL): likewise.
	(SQL_NO_TOTAL): likewise.
	(SQL_NON_NULLABLE_COLUMNS): likewise.
	(SQL_NOSCAN): likewise.
	(SQL_NOSCAN_DEFAULT): likewise.
	(SQL_NOSCAN_OFF): likewise.
	(SQL_NOSCAN_ON): likewise.
	(SQL_NUM_EXTENSIONS): likewise.
	(SQL_NUM_FUNCTIONS): likewise.
	(SQL_NUMERIC_FUNCTIONS): likewise.
	(SQL_OAC_LEVEL1): likewise.
	(SQL_OAC_LEVEL2): likewise.
	(SQL_OAC_NONE): likewise.
	(SQL_ODBC_API_CONFORMANCE): likewise.
	(SQL_ODBC_CURSORS): likewise.
	(SQL_ODBC_KEYWORDS): likewise.
	(SQL_ODBC_SAG_CLI_CONFORMANCE): likewise.
	(SQL_ODBC_SQL_CONFORMANCE): likewise.
	(SQL_ODBC_SQL_OPT_IEF): likewise.
	(SQL_ODBC_VER): likewise.
	(SQL_OPT_TRACE): likewise.
	(SQL_OPT_TRACE_DEFAULT): likewise.
	(SQL_OPT_TRACE_FILE_DEFAULT): likewise.
	(SQL_OPT_TRACE_OFF): likewise.
	(SQL_OPT_TRACE_ON): likewise.
	(SQL_OPT_TRACEFILE): likewise.
	(SQL_OSC_CORE): likewise.
	(SQL_OSC_EXTENDED): likewise.
	(SQL_OSC_MINIMUM): likewise.
	(SQL_OSCC_COMPLIANT): likewise.
	(SQL_OSCC_NOT_COMPLIANT): likewise.
	(SQL_OU_DML_STATEMENTS): likewise.
	(SQL_OU_INDEX_DEFINITION): likewise.
	(SQL_OU_PRIVILEGE_DEFINITION): likewise.
	(SQL_OU_PROCEDURE_INVOCATION): likewise.
	(SQL_OU_TABLE_DEFINITION): likewise.
	(SQL_OUTER_JOINS): likewise.
	(SQL_OWNER_TERM): likewise.
	(SQL_OWNER_USAGE): likewise.
	(SQL_PACKET_SIZE): likewise.
	(SQL_PC_NOT_PSEUDO): likewise.
	(SQL_POS_add): likewise.
	(SQL_POS_DELETE): likewise.
	(SQL_POS_OPERATIONS): likewise.
	(SQL_POS_POSITION): likewise.
	(SQL_POS_REFRESH): likewise.
	(SQL_POS_UPDATE): likewise.
	(SQL_POSITIONED_STATEMENTS): likewise.
	(SQL_PROCEDURE_TERM): likewise.
	(SQL_PROCEDURES): likewise.
	(SQL_PS_POSITIONED_DELETE): likewise.
	(SQL_PS_POSITIONED_UPDATE): likewise.
	(SQL_PS_SELECT_FOR_UPDATE): likewise.
	(SQL_QL_END): likewise.
	(SQL_QL_START): likewise.
	(SQL_QU_DML_STATEMENTS): likewise.
	(SQL_QU_INDEX_DEFINITION): likewise.
	(SQL_QU_PRIVILEGE_DEFINITION): likewise.
	(SQL_QU_PROCEDURE_INVOCATION): likewise.
	(SQL_QU_TABLE_DEFINITION): likewise.
	(SQL_QUALIFIER_LOCATION): likewise.
	(SQL_QUALIFIER_NAME_SEPARATOR): likewise.
	(SQL_QUALIFIER_TERM): likewise.
	(SQL_QUALIFIER_USAGE): likewise.
	(SQL_QUERY_TIMEOUT): likewise.
	(SQL_QUERY_TIMEOUT_DEFAULT): likewise.
	(SQL_QUICK): likewise.
	(SQL_QUIET_MODE): likewise.
	(SQL_QUOTED_IDENTIFIER_CASE): likewise.
	(SQL_RD_DEFAULT): likewise.
	(SQL_RD_OFF): likewise.
	(SQL_RD_ON): likewise.
	(SQL_RETRIEVE_DATA): likewise.
	(SQL_ROW_NUMBER): likewise.
	(SQL_ROW_UPDATES): likewise.
	(SQL_ROWSET_SIZE): likewise.
	(SQL_ROWSET_SIZE_DEFAULT): likewise.
	(SQL_ROWVER): likewise.
	(SQL_SC_NON_UNIQUE): likewise.
	(SQL_SC_TRY_UNIQUE): likewise.
	(SQL_SC_UNIQUE): likewise.
	(SQL_SCCO_OPT_TIMESTAMP): likewise.
	(SQL_SCROLL_DYNAMIC): likewise.
	(SQL_SCROLL_FORWARD_ONLY): likewise.
	(SQL_SCROLL_KEYSET_DRIVEN): likewise.
	(SQL_SCROLL_OPTIONS): likewise.
	(SQL_SCROLL_STATIC): likewise.
	(SQL_SEARCHABLE): likewise.
	(SQL_SIGNED_OFFSET): likewise.
	(SQL_SIMULATE_CURSOR): likewise.
	(SQL_SO_DYNAMIC): likewise.
	(SQL_SO_FORWARD_ONLY): likewise.
	(SQL_SO_KEYSET_DRIVEN): likewise.
	(SQL_SO_MIXED): likewise.
	(SQL_SO_STATIC): likewise.
	(SQL_SPEC_MAJOR): likewise.
	(SQL_SPEC_MINOR): likewise.
	(SQL_SPEC_STRING): likewise.
	(SQL_SQ_COMPARISON): likewise.
	(SQL_SQ_CORRELATED_SUBQUERIES): likewise.
	(SQL_SQ_EXISTS): likewise.
	(SQL_SQ_IN): likewise.
	(SQL_SQ_QUANTIFIED): likewise.
	(SQL_SQLSTATE_SIZE): likewise.
	(SQL_SS_addITIONS): likewise.
	(SQL_SS_DELETIONS): likewise.
	(SQL_SS_UPDATES): likewise.
	(SQL_STATIC_SENSITIVITY): likewise.
	(SQL_STMT_OPT_MAX): likewise.
	(SQL_STMT_OPT_MIN): likewise.
	(SQL_STRING_FUNCTIONS): likewise.
	(SQL_SUBQUERIES): likewise.
	(SQL_SYSTEM_FUNCTIONS): likewise.
	(SQL_TABLE_STAT): likewise.
	(SQL_TABLE_TERM): likewise.
	(SQL_TIME): likewise.
	(SQL_TIMEDATE_add_INTERVALS): likewise.
	(SQL_TIMEDATE_DIFF_INTERVALS): likewise.
	(SQL_TIMEDATE_FUNCTIONS): likewise.
	(SQL_TIMESTAMP): likewise.
	(SQL_TINYINT): likewise.
	(SQL_TRANSLATE_DLL): likewise.
	(SQL_TRANSLATE_OPTION): likewise.
	(SQL_TXN_ISOLATION): likewise.
	(SQL_TXN_VERSIONING): likewise.
	(SQL_TYPE_DRIVER_END): likewise.
	(SQL_TYPE_DRIVER_START): likewise.
	(SQL_TYPE_MAX): likewise.
	(SQL_TYPE_MIN): likewise.
	(SQL_TYPE_NULL): likewise.
	(SQL_U_UNION): likewise.
	(SQL_U_UNION_ALL): likewise.
	(SQL_UB_DEFAULT): likewise.
	(SQL_UB_OFF): likewise.
	(SQL_UB_ON): likewise.
	(SQL_UNICODE): likewise.
	(SQL_UNICODE_CHAR): likewise.
	(SQL_UNICODE_LONGVARCHAR): likewise.
	(SQL_UNICODE_VARCHAR): likewise.
	(SQL_UNION): likewise.
	(SQL_UNSEARCHABLE): likewise.
	(SQL_UNSIGNED_OFFSET): likewise.
	(SQL_USE_BOOKMARKS): likewise.
	(SQL_VARBINARY): likewise.
	(SQL_TRUE): add define for ODBC3.x.
	(SQL_FALSE): likewise.
	(SQL_AM_CONNECTION): likewise.
	(SQL_AM_NONE): likewise.
	(SQL_AM_STATEMENT): likewise.
	(SQL_API_SQLALLOCHANDLE): likewise.
	(SQL_API_SQLBINDPARAM): likewise.
	(SQL_API_SQLCLOSECURSOR): likewise.
	(SQL_API_SQLCOLATTRIBUTE): likewise.
	(SQL_API_SQLCOPYDESC): likewise.
	(SQL_API_SQLENDTRAN): likewise.
	(SQL_API_SQLFETCHSCROLL): likewise.
	(SQL_API_SQLFREEHANDLE): likewise.
	(SQL_API_SQLGETCONNECTATTR): likewise.
	(SQL_API_SQLGETDESCFIELD): likewise.
	(SQL_API_SQLGETDESCREC): likewise.
	(SQL_API_SQLGETDIAGFIELD): likewise.
	(SQL_API_SQLGETDIAGREC): likewise.
	(SQL_API_SQLGETENVATTR): likewise.
	(SQL_API_SQLGETSTMTATTR): likewise.
	(SQL_API_SQLSETCONNECTATTR): likewise.
	(SQL_API_SQLSETDESCFIELD): likewise.
	(SQL_API_SQLSETDESCREC): likewise.
	(SQL_API_SQLSETENVATTR): likewise.
	(SQL_API_SQLSETSTMTATTR): likewise.
	(SQL_ARD_TYPE): likewise.
	(SQL_AT_add_CONSTRAINT): likewise.
	(SQL_ATTR_APP_PARAM_DESC): likewise.
	(SQL_ATTR_APP_ROW_DESC): likewise.
	(SQL_ATTR_AUTO_IPD): likewise.
	(SQL_ATTR_CURSOR_SCROLLABLE): likewise.
	(SQL_ATTR_CURSOR_SENSITIVITY): likewise.
	(SQL_ATTR_IMP_PARAM_DESC): likewise.
	(SQL_ATTR_IMP_ROW_DESC): likewise.
	(SQL_ATTR_METADATA_ID): likewise.
	(SQL_ATTR_OUTPUT_NTS): likewise.
	(SQL_CATALOG_NAME): likewise.
	(SQL_CODE_DATE): likewise.
	(SQL_CODE_TIME): likewise.
	(SQL_CODE_TIMESTAMP): likewise.
	(SQL_COLLATION_SEQ): likewise.
	(SQL_CURSOR_SENSITIVITY): likewise.
	(SQL_DATE_LEN): likewise.
	(SQL_DATETIME): likewise.
	(SQL_DEFAULT): likewise.
	(SQL_DESC_ALLOC_AUTO): likewise.
	(SQL_DESC_ALLOC_TYPE): likewise.
	(SQL_DESC_ALLOC_USER): likewise.
	(SQL_DESC_COUNT): likewise.
	(SQL_DESC_DATA_PTR): likewise.
	(SQL_DESC_DATETIME_INTERVAL_CODE): likewise.
	(SQL_DESC_INDICATOR_PTR): likewise.
	(SQL_DESC_LENGTH): likewise.
	(SQL_DESC_NAME): likewise.
	(SQL_DESC_NULLABLE): likewise.
	(SQL_DESC_OCTET_LENGTH): likewise.
	(SQL_DESC_OCTET_LENGTH_PTR): likewise.
	(SQL_DESC_PRECISION): likewise.
	(SQL_DESC_SCALE): likewise.
	(SQL_DESC_TYPE): likewise.
	(SQL_DESC_UNNAMED): likewise.
	(SQL_DESCRIBE_PARAMETER): likewise.
	(SQL_DIAG_ALTER_DOMAIN): likewise.
	(SQL_DIAG_ALTER_TABLE): likewise.
	(SQL_DIAG_CALL): likewise.
	(SQL_DIAG_CLASS_ORIGIN): likewise.
	(SQL_DIAG_CONNECTION_NAME): likewise.
	(SQL_DIAG_CREATE_ASSERTION): likewise.
	(SQL_DIAG_CREATE_CHARACTER_SET): likewise.
	(SQL_DIAG_CREATE_COLLATION): likewise.
	(SQL_DIAG_CREATE_DOMAIN): likewise.
	(SQL_DIAG_CREATE_INDEX): likewise.
	(SQL_DIAG_CREATE_SCHEMA): likewise.
	(SQL_DIAG_CREATE_TABLE): likewise.
	(SQL_DIAG_CREATE_TRANSLATION): likewise.
	(SQL_DIAG_CREATE_VIEW): likewise.
	(SQL_DIAG_DELETE_WHERE): likewise.
	(SQL_DIAG_DROP_ASSERTION): likewise.
	(SQL_DIAG_DROP_CHARACTER_SET): likewise.
	(SQL_DIAG_DROP_COLLATION): likewise.
	(SQL_DIAG_DROP_DOMAIN): likewise.
	(SQL_DIAG_DROP_INDEX): likewise.
	(SQL_DIAG_DROP_SCHEMA): likewise.
	(SQL_DIAG_DROP_TABLE): likewise.
	(SQL_DIAG_DROP_TRANSLATION): likewise.
	(SQL_DIAG_DROP_VIEW): likewise.
	(SQL_DIAG_DYNAMIC_DELETE_CURSOR): likewise.
	(SQL_DIAG_DYNAMIC_FUNCTION): likewise.
	(SQL_DIAG_DYNAMIC_FUNCTION_CODE): likewise.
	(SQL_DIAG_DYNAMIC_UPDATE_CURSOR): likewise.
	(SQL_DIAG_GRANT): likewise.
	(SQL_DIAG_INSERT): likewise.
	(SQL_DIAG_MESSAGE_TEXT): likewise.
	(SQL_DIAG_NATIVE): likewise.
	(SQL_DIAG_NUMBER): likewise.
	(SQL_DIAG_RETURNCODE): likewise.
	(SQL_DIAG_REVOKE): likewise.
	(SQL_DIAG_ROW_COUNT): likewise.
	(SQL_DIAG_SELECT_CURSOR): likewise.
	(SQL_DIAG_SERVER_NAME): likewise.
	(SQL_DIAG_SQLSTATE): likewise.
	(SQL_DIAG_SUBCLASS_ORIGIN): likewise.
	(SQL_DIAG_UNKNOWN_STATEMENT): likewise.
	(SQL_DIAG_UPDATE_WHERE): likewise.
	(SQL_FALSE): likewise.
	(SQL_FETCH_ABSOLUTE): likewise.
	(SQL_FETCH_LAST): likewise.
	(SQL_FETCH_PRIOR): likewise.
	(SQL_FETCH_RELATIVE): likewise.
	(SQL_HANDLE_DBC): likewise.
	(SQL_HANDLE_DESC): likewise.
	(SQL_HANDLE_ENV): likewise.
	(SQL_HANDLE_STMT): likewise.
	(SQL_INSENSITIVE): likewise.
	(SQL_INTEGRITY): likewise.
	(SQL_MAX_CATALOG_NAME_LEN): likewise.
	(SQL_MAX_CONCURRENT_ACTIVITIES): likewise.
	(SQL_MAX_DRIVER_CONNECTIONS): likewise.
	(SQL_MAX_IDENTIFIER_LEN): likewise.
	(SQL_MAX_SCHEMA_NAME_LEN): likewise.
	(SQL_MAXIMUM_CATALOG_NAME_LENGTH): likewise.
	(SQL_MAXIMUM_COLUMN_NAME_LENGTH): likewise.
	(SQL_MAXIMUM_COLUMNS_IN_GROUP_BY): likewise.
	(SQL_MAXIMUM_COLUMNS_IN_INDEX): likewise.
	(SQL_MAXIMUM_COLUMNS_IN_ORDER_BY): likewise.
	(SQL_MAXIMUM_COLUMNS_IN_SELECT): likewise.
	(SQL_MAXIMUM_CONCURRENT_ACTIVITIES): likewise.
	(SQL_MAXIMUM_CURSOR_NAME_LENGTH): likewise.
	(SQL_MAXIMUM_DRIVER_CONNECTIONS): likewise.
	(SQL_MAXIMUM_IDENTIFIER_LENGTH): likewise.
	(SQL_MAXIMUM_INDEX_SIZE): likewise.
	(SQL_MAXIMUM_ROW_SIZE): likewise.
	(SQL_MAXIMUM_SCHEMA_NAME_LENGTH): likewise.
	(SQL_MAXIMUM_STATEMENT_LENGTH): likewise.
	(SQL_MAXIMUM_TABLES_IN_SELECT): likewise.
	(SQL_MAXIMUM_USER_NAME_LENGTH): likewise.
	(SQL_NAMED): likewise.
	(SQL_NONSCROLLABLE): likewise.
	(SQL_NTSL): likewise.
	(SQL_NULL_HANDLE): likewise.
	(SQL_NULL_HDESC): likewise.
	(SQL_OUTER_JOIN_CAPABILITIES): likewise.
	(SQL_PRED_BASIC): likewise.
	(SQL_PRED_CHAR): likewise.
	(SQL_PRED_NONE): likewise.
	(SQL_ROW_IDENTIFIER): likewise.
	(SQL_SCROLLABLE): likewise.
	(SQL_SENSITIVE): likewise.
	(SQL_SUCCEEDED(rc)): likewise.
	(SQL_TIME_LEN): likewise.
	(SQL_TIMESTAMP_LEN): likewise.
	(SQL_TRANSACTION_CAPABLE): likewise.
	(SQL_TRANSACTION_ISOLATION_OPTION): likewise.
	(SQL_TRANSACTION_READ_COMMITTED): likewise.
	(SQL_TRANSACTION_READ_UNCOMMITTED): likewise.
	(SQL_TRANSACTION_REPEATABLE_READ): likewise.
	(SQL_TRANSACTION_SERIALIZABLE): likewise.
	(SQL_TYPE_DATE): likewise.
	(SQL_TYPE_TIME): likewise.
	(SQL_TYPE_TIMESTAMP): likewise.
	(SQL_UNKNOWN_TYPE): likewise.
	(SQL_UNNAMED): likewise.
	(SQL_UNSPECIFIED): likewise.
	(SQL_XOPEN_CLI_YEAR): likewise.
	(SQLAllocConnect): add comment marking as deperecated.
	(SQLAllocEnv): likewise.
	(SQLAllocStmt): likewise.
	(SQLFreeConnect): likewise.
	(SQLFreeEnv): likewise.
	(SQLGetConnectOption): likewise.
	(SQLGetStmtOption): likewise.

	* include/sqlext.h (#include <sqlucode.h>): add directive.
	(SQLSetScrollOptions): non-core function, move prototype from sql.h.
	(SQLColAttributes): likewise.
	(SQLBulkOperations): add function prototype.
	(SQLAllocHandleStd): likewise
	(TraceReturn): add Trace API prototype.
	(TraceVersion): likewise.
	(ODBCGetTryWaitValue):likewise.
	(ODBCSetTryWaitValue): likewise.
	(SQL_LOCK_RECORD): correct function macro.
	(SQL_REFRESH_RECORD): likewise.
	(SQLINTENGER and SQLUINTEGER): replace with SQLLEN and SQLULEN for
	_WIN64 compatability.
	move defines for non-core functions from sql.h to sqlext.h (refer
	changes for sql.h)
	(SQL_ACTIVE_ENVIRONMENTS): new ODBC3.x define
	(SQL_AD_ADD_CONSTRAINT_DEFERRABLE): likewise.
	(SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED): likewise.
	(SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
	(SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE): likewise.
	(SQL_AD_ADD_DOMAIN_CONSTRAINT): likewise.
	(SQL_AD_ADD_DOMAIN_DEFAULT): likewise.
	(SQL_AD_CONSTRAINT_NAME_DEFINITION): likewise.
	(SQL_AD_DROP_DOMAIN_CONSTRAINT): likewise.
	(SQL_AD_DROP_DOMAIN_DEFAULT): likewise.
	(SQL_AF_ALL): likewise.
	(SQL_AF_AVG): likewise.
	(SQL_AF_COUNT): likewise.
	(SQL_AF_DISTINCT): likewise.
	(SQL_AF_MAX): likewise.
	(SQL_AF_MIN): likewise.
	(SQL_AF_SUM): likewise.
	(SQL_AGGREGATE_FUNCTIONS): likewise.
	(SQL_ALL_CATALOGS): likewise.
	(SQL_ALL_SCHEMAS): likewise.
	(SQL_ALL_TABLE_TYPES): likewise.
	(SQL_ALTER_DOMAIN): likewise.
	(SQL_AM_CONNECTION): likewise.
	(SQL_AM_NONE): likewise.
	(SQL_AM_STATEMENT): likewise.
	(SQL_API_ODBC3_ALL_FUNCTIONS): likewise.
	(SQL_API_ODBC3_ALL_FUNCTIONS_SIZE): likewise.
	(SQL_API_SQLALLOCHANDLESTD): likewise.
	(SQL_API_SQLBULKOPERATIONS): likewise.
	(SQL_ASYNC_MODE): likewise.
	(SQL_AT_ADD_COLUMN_COLLATION): likewise.
	(SQL_AT_ADD_COLUMN_DEFAULT): likewise.
	(SQL_AT_ADD_COLUMN_SINGLE): likewise.
	(SQL_AT_ADD_TABLE_CONSTRAINT): likewise.
	(SQL_AT_CONSTRAINT_DEFERRABLE): likewise.
	(SQL_AT_CONSTRAINT_INITIALLY_DEFERRED): likewise.
	(SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
	(SQL_AT_CONSTRAINT_NAME_DEFINITION): likewise.
	(SQL_AT_CONSTRAINT_NON_DEFERRABLE): likewise.
	(SQL_AT_DROP_COLUMN_CASCADE): likewise.
	(SQL_AT_DROP_COLUMN_DEFAULT): likewise.
	(SQL_AT_DROP_COLUMN_RESTRICT): likewise.
	(SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE): likewise.
	(SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT): likewise.
	(SQL_AT_SET_COLUMN_DEFAULT): likewise.
	(SQL_ATTR_ACCESS_MODE): likewise.
	(SQL_ATTR_ASYNC_ENABLE): likewise.
	(SQL_ATTR_AUTOCOMMIT): likewise.
	(SQL_ATTR_CONCURRENCY): likewise.
	(SQL_ATTR_CONNECTION_POOLING): likewise.
	(SQL_ATTR_CONNECTION_TIMEOUT): likewise.
	(SQL_ATTR_CP_MATCH): likewise.
	(SQL_ATTR_CURRENT_CATALOG): likewise.
	(SQL_ATTR_CURSOR_TYPE): likewise.
	(SQL_ATTR_DISCONNECT_BEHAVIOR): likewise.
	(SQL_ATTR_ENABLE_AUTO_IPD): likewise.
	(SQL_ATTR_ENLIST_IN_DTC): likewise.
	(SQL_ATTR_ENLIST_IN_XA): likewise.
	(SQL_ATTR_FETCH_BOOKMARK_PTR): likewise.
	(SQL_ATTR_KEYSET_SIZE): likewise.
	(SQL_ATTR_LOGIN_TIMEOUT): likewise.
	(SQL_ATTR_MAX_LENGTH): likewise.
	(SQL_ATTR_MAX_ROWS): likewise.
	(SQL_ATTR_NOSCAN): likewise.
	(SQL_ATTR_ODBC_CURSORS): likewise.
	(SQL_ATTR_ODBC_VERSION): likewise.
	(SQL_ATTR_PACKET_SIZE): likewise.
	(SQL_ATTR_PARAM_BIND_OFFSET_PTR): likewise.
	(SQL_ATTR_PARAM_BIND_TYPE): likewise.
	(SQL_ATTR_PARAM_OPERATION_PTR): likewise.
	(SQL_ATTR_PARAM_STATUS_PTR): likewise.
	(SQL_ATTR_PARAMS_PROCESSED_PTR): likewise.
	(SQL_ATTR_PARAMSET_SIZE): likewise.
	(SQL_ATTR_QUERY_TIMEOUT): likewise.
	(SQL_ATTR_QUIET_MODE): likewise.
	(SQL_ATTR_RETRIEVE_DATA): likewise.
	(SQL_ATTR_ROW_ARRAY_SIZE): likewise.
	(SQL_ATTR_ROW_BIND_OFFSET_PTR): likewise.
	(SQL_ATTR_ROW_BIND_TYPE): likewise.
	(SQL_ATTR_ROW_NUMBER): likewise.
	(SQL_ATTR_ROW_OPERATION_PTR): likewise.
	(SQL_ATTR_ROW_STATUS_PTR): likewise.
	(SQL_ATTR_ROWS_FETCHED_PTR): likewise.
	(SQL_ATTR_SIMULATE_CURSOR): likewise.
	(SQL_ATTR_TRACE): likewise.
	(SQL_ATTR_TRACEFILE): likewise.
	(SQL_ATTR_TRANSLATE_LIB): likewise.
	(SQL_ATTR_TRANSLATE_OPTION): likewise.
	(SQL_ATTR_TXN_ISOLATION): likewise.
	(SQL_ATTR_USE_BOOKMARKS): likewise.
	(SQL_BATCH_ROW_COUNT): likewise.
	(SQL_BATCH_SUPPORT): likewise.
	(SQL_BRC_EXPLICIT): likewise.
	(SQL_BRC_PROCEDURES): likewise.
	(SQL_BRC_ROLLED_UP): likewise.
	(SQL_BS_ROW_COUNT_EXPLICIT): likewise.
	(SQL_BS_ROW_COUNT_PROC): likewise.
	(SQL_BS_SELECT_EXPLICIT): likewise.
	(SQL_BS_SELECT_PROC): likewise.
	(SQL_C_INTERVAL_DAY): likewise.
	(SQL_C_INTERVAL_DAY_TO_HOUR): likewise.
	(SQL_C_INTERVAL_DAY_TO_MINUTE): likewise.
	(SQL_C_INTERVAL_DAY_TO_SECOND): likewise.
	(SQL_C_INTERVAL_HOUR): likewise.
	(SQL_C_INTERVAL_HOUR_TO_MINUTE): likewise.
	(SQL_C_INTERVAL_HOUR_TO_SECOND): likewise.
	(SQL_C_INTERVAL_MINUTE): likewise.
	(SQL_C_INTERVAL_MINUTE_TO_SECOND): likewise.
	(SQL_C_INTERVAL_MONTH): likewise.
	(SQL_C_INTERVAL_SECOND): likewise.
	(SQL_C_INTERVAL_YEAR): likewise.
	(SQL_C_INTERVAL_YEAR_TO_MONTH): likewise.
	(SQL_C_NUMERIC): likewise.
	(SQL_C_SBIGINT): likewise.
	(SQL_C_TYPE_DATE): likewise.
	(SQL_C_TYPE_TIME): likewise.
	(SQL_C_TYPE_TIMESTAMP): likewise.
	(SQL_C_UBIGINT): likewise.
	(SQL_C_VARBOOKMARK): likewise.
	(SQL_CA_CONSTRAINT_DEFERRABLE): likewise.
	(SQL_CA_CONSTRAINT_INITIALLY_DEFERRED): likewise.
	(SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
	(SQL_CA_CONSTRAINT_NON_DEFERRABLE): likewise.
	(SQL_CA_CREATE_ASSERTION): likewise.
	(SQL_CA1_ABSOLUTE): likewise.
	(SQL_CA1_BOOKMARK): likewise.
	(SQL_CA1_BULK_ADD): likewise.
	(SQL_CA1_BULK_DELETE_BY_BOOKMARK): likewise.
	(SQL_CA1_BULK_FETCH_BY_BOOKMARK): likewise.
	(SQL_CA1_BULK_UPDATE_BY_BOOKMARK): likewise.
	(SQL_CA1_LOCK_EXCLUSIVE): likewise.
	(SQL_CA1_LOCK_NO_CHANGE): likewise.
	(SQL_CA1_LOCK_UNLOCK): likewise.
	(SQL_CA1_NEXT): likewise.
	(SQL_CA1_POS_DELETE): likewise.
	(SQL_CA1_POS_POSITION): likewise.
	(SQL_CA1_POS_REFRESH): likewise.
	(SQL_CA1_POS_UPDATE): likewise.
	(SQL_CA1_POSITIONED_DELETE): likewise.
	(SQL_CA1_POSITIONED_UPDATE): likewise.
	(SQL_CA1_RELATIVE): likewise.
	(SQL_CA1_SELECT_FOR_UPDATE): likewise.
	(SQL_CA2_CRC_APPROXIMATE): likewise.
	(SQL_CA2_CRC_EXACT): likewise.
	(SQL_CA2_LOCK_CONCURRENCY): likewise.
	(SQL_CA2_MAX_ROWS_AFFECTS_ALL): likewise.
	(SQL_CA2_MAX_ROWS_CATALOG): likewise.
	(SQL_CA2_MAX_ROWS_DELETE): likewise.
	(SQL_CA2_MAX_ROWS_INSERT): likewise.
	(SQL_CA2_MAX_ROWS_SELECT): likewise.
	(SQL_CA2_MAX_ROWS_UPDATE): likewise.
	(SQL_CA2_OPT_ROWVER_CONCURRENCY): likewise.
	(SQL_CA2_OPT_VALUES_CONCURRENCY): likewise.
	(SQL_CA2_READ_ONLY_CONCURRENCY): likewise.
	(SQL_CA2_SENSITIVITY_ADDITIONS): likewise.
	(SQL_CA2_SENSITIVITY_DELETIONS): likewise.
	(SQL_CA2_SENSITIVITY_UPDATES): likewise.
	(SQL_CA2_SIMULATE_NON_UNIQUE): likewise.
	(SQL_CA2_SIMULATE_TRY_UNIQUE): likewise.
	(SQL_CA2_SIMULATE_UNIQUE): likewise.
	(SQL_CATALOG_LOCATION): likewise.
	(SQL_CATALOG_NAME_SEPARATOR): likewise.
	(SQL_CATALOG_TERM): likewise.
	(SQL_CATALOG_USAGE): likewise.
	(SQL_CCOL_CREATE_COLLATION): likewise.
	(SQL_CCS_COLLATE_CLAUSE): likewise.
	(SQL_CCS_CREATE_CHARACTER_SET): likewise.
	(SQL_CCS_LIMITED_COLLATION): likewise.
	(SQL_CDO_COLLATION): likewise.
	(SQL_CDO_CONSTRAINT): likewise.
	(SQL_CDO_CONSTRAINT_DEFERRABLE): likewise.
	(SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED): likewise.
	(SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
	(SQL_CDO_CONSTRAINT_NAME_DEFINITION): likewise.
	(SQL_CDO_CONSTRAINT_NON_DEFERRABLE): likewise.
	(SQL_CDO_CREATE_DOMAIN): likewise.
	(SQL_CDO_DEFAULT): likewise.
	(SQL_CL_END): likewise.
	(SQL_CL_START): likewise.
	(SQL_COL_PRED_BASIC): likewise.
	(SQL_COL_PRED_CHAR): likewise.
	(SQL_COLUMN_DRIVER_START): likewise.
	(SQL_COLUMN_IGNORE): likewise.
	(SQL_COLUMN_NUMBER_UNKNOWN): likewise.
	(SQL_CONVERT_GUID): likewise.
	(SQL_CONVERT_INTERVAL_DAY_TIME): likewise.
	(SQL_CONVERT_INTERVAL_YEAR_MONTH): likewise.
	(SQL_CONVERT_WCHAR): likewise.
	(SQL_CONVERT_WLONGVARCHAR): likewise.
	(SQL_CONVERT_WVARCHAR): likewise.
	(SQL_CP_DEFAULT): likewise.
	(SQL_CP_MATCH_DEFAULT): likewise.
	(SQL_CP_OFF): likewise.
	(SQL_CP_ONE_PER_DRIVER): likewise.
	(SQL_CP_ONE_PER_HENV): likewise.
	(SQL_CP_RELAXED_MATCH): likewise.
	(SQL_CP_STRICT_MATCH): likewise.
	(SQL_CREATE_ASSERTION): likewise.
	(SQL_CREATE_CHARACTER_SET): likewise.
	(SQL_CREATE_COLLATION): likewise.
	(SQL_CREATE_DOMAIN): likewise.
	(SQL_CREATE_SCHEMA): likewise.
	(SQL_CREATE_TABLE): likewise.
	(SQL_CREATE_TRANSLATION): likewise.
	(SQL_CREATE_VIEW): likewise.
	(SQL_CS_AUTHORIZATION): likewise.
	(SQL_CS_CREATE_SCHEMA): likewise.
	(SQL_CS_DEFAULT_CHARACTER_SET): likewise.
	(SQL_CT_COLUMN_COLLATION): likewise.
	(SQL_CT_COLUMN_CONSTRAINT): likewise.
	(SQL_CT_COLUMN_DEFAULT): likewise.
	(SQL_CT_COMMIT_DELETE): likewise.
	(SQL_CT_COMMIT_PRESERVE): likewise.
	(SQL_CT_CONSTRAINT_DEFERRABLE): likewise.
	(SQL_CT_CONSTRAINT_INITIALLY_DEFERRED): likewise.
	(SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
	(SQL_CT_CONSTRAINT_NAME_DEFINITION): likewise.
	(SQL_CT_CONSTRAINT_NON_DEFERRABLE): likewise.
	(SQL_CT_CREATE_TABLE): likewise.
	(SQL_CT_GLOBAL_TEMPORARY): likewise.
	(SQL_CT_LOCAL_TEMPORARY): likewise.
	(SQL_CT_TABLE_CONSTRAINT): likewise.
	(SQL_CTR_CREATE_TRANSLATION): likewise.
	(SQL_CU_DML_STATEMENTS): likewise.
	(SQL_CU_INDEX_DEFINITION): likewise.
	(SQL_CU_PRIVILEGE_DEFINITION): likewise.
	(SQL_CU_PROCEDURE_INVOCATION): likewise.
	(SQL_CU_TABLE_DEFINITION): likewise.
	(SQL_CVT_GUID): likewise.
	(SQL_CVT_INTERVAL_DAY_TIME): likewise.
	(SQL_CVT_INTERVAL_YEAR_MONTH): likewise.
	(SQL_CVT_WCHAR): likewise.
	(SQL_CVT_WLONGVARCHAR): likewise.
	(SQL_CVT_WVARCHAR): likewise.
	(SQL_DA_DROP_ASSERTION): likewise.
	(SQL_DATETIME_LITERALS): likewise.
	(SQL_DB_DEFAULT): likewise.
	(SQL_DB_DISCONNECT): likewise.
	(SQL_DB_RETURN_TO_POOL): likewise.
	(SQL_DC_DROP_COLLATION): likewise.
	(SQL_DCS_DROP_CHARACTER_SET): likewise.
	(SQL_DD_CASCADE): likewise.
	(SQL_DD_DROP_DOMAIN): likewise.
	(SQL_DD_RESTRICT): likewise.
	(SQL_DDL_INDEX): likewise.
	(SQL_DELETE_BY_BOOKMARK): likewise.
	(SQL_DESC_ARRAY_SIZE): likewise.
	(SQL_DESC_ARRAY_STATUS_PTR): likewise.
	(SQL_DESC_AUTO_UNIQUE_VALUE): likewise.
	(SQL_DESC_BASE_COLUMN_NAME): likewise.
	(SQL_DESC_BASE_TABLE_NAME): likewise.
	(SQL_DESC_BIND_OFFSET_PTR): likewise.
	(SQL_DESC_BIND_TYPE): likewise.
	(SQL_DESC_CASE_SENSITIVE): likewise.
	(SQL_DESC_CATALOG_NAME): likewise.
	(SQL_DESC_CONCISE_TYPE): likewise.
	(SQL_DESC_DATETIME_INTERVAL_PRECISION): likewise.
	(SQL_DESC_DISPLAY_SIZE): likewise.
	(SQL_DESC_FIXED_PREC_SCALE): likewise.
	(SQL_DESC_LABEL): likewise.
	(SQL_DESC_LITERAL_PREFIX): likewise.
	(SQL_DESC_LITERAL_SUFFIX): likewise.
	(SQL_DESC_LOCAL_TYPE_NAME): likewise.
	(SQL_DESC_MAXIMUM_SCALE): likewise.
	(SQL_DESC_MINIMUM_SCALE): likewise.
	(SQL_DESC_NUM_PREC_RADIX): likewise.
	(SQL_DESC_PARAMETER_TYPE): likewise.
	(SQL_DESC_ROWS_PROCESSED_PTR): likewise.
	(SQL_DESC_SCHEMA_NAME): likewise.
	(SQL_DESC_SEARCHABLE): likewise.
	(SQL_DESC_TABLE_NAME): likewise.
	(SQL_DESC_TYPE_NAME): likewise.
	(SQL_DESC_UNSIGNED): likewise.
	(SQL_DESC_UPDATABLE): likewise.
	(SQL_DI_CREATE_INDEX): likewise.
	(SQL_DI_DROP_INDEX): likewise.
	(SQL_DIAG_COLUMN_NUMBER): likewise.
	(SQL_DIAG_CURSOR_ROW_COUNT): likewise.
	(SQL_DIAG_ROW_NUMBER): likewise.
	(SQL_DL_SQL92_DATE): likewise.
	(SQL_DL_SQL92_INTERVAL_DAY): likewise.
	(SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR): likewise.
	(SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE): likewise.
	(SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND): likewise.
	(SQL_DL_SQL92_INTERVAL_HOUR): likewise.
	(SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE): likewise.
	(SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND): likewise.
	(SQL_DL_SQL92_INTERVAL_MINUTE): likewise.
	(SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND): likewise.
	(SQL_DL_SQL92_INTERVAL_MONTH): likewise.
	(SQL_DL_SQL92_INTERVAL_SECOND): likewise.
	(SQL_DL_SQL92_INTERVAL_YEAR): likewise.
	(SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH): likewise.
	(SQL_DL_SQL92_TIME): likewise.
	(SQL_DL_SQL92_TIMESTAMP): likewise.
	(SQL_DM_VER): likewise.
	(SQL_DRIVER_HDESC): likewise.
	(SQL_DROP_ASSERTION): likewise.
	(SQL_DROP_CHARACTER_SET): likewise.
	(SQL_DROP_COLLATION): likewise.
	(SQL_DROP_DOMAIN): likewise.
	(SQL_DROP_SCHEMA): likewise.
	(SQL_DROP_TABLE): likewise.
	(SQL_DROP_TRANSLATION): likewise.
	(SQL_DROP_VIEW): likewise.
	(SQL_DS_CASCADE): likewise.
	(SQL_DS_DROP_SCHEMA): likewise.
	(SQL_DS_RESTRICT): likewise.
	(SQL_DT_CASCADE): likewise.
	(SQL_DT_DROP_TABLE): likewise.
	(SQL_DT_RESTRICT): likewise.
	(SQL_DTC_DONE): likewise.
	(SQL_DTR_DROP_TRANSLATION): likewise.
	(SQL_DV_CASCADE): likewise.
	(SQL_DV_DROP_VIEW): likewise.
	(SQL_DV_RESTRICT): likewise.
	(SQL_DYNAMIC_CURSOR_ATTRIBUTES1): likewise.
	(SQL_DYNAMIC_CURSOR_ATTRIBUTES2): likewise.
	(SQL_EXT_API_LAST): likewise.
	(SQL_EXT_API_START): likewise.
	(SQL_FETCH_BY_BOOKMARK): likewise.
	(SQL_FETCH_FIRST_SYSTEM): likewise.
	(SQL_FETCH_FIRST_USER): likewise.
	(SQL_FN_CVT_CAST): likewise.
	(SQL_FN_STR_BIT_LENGTH): likewise.
	(SQL_FN_STR_CHAR_LENGTH): likewise.
	(SQL_FN_STR_CHARACTER_LENGTH): likewise.
	(SQL_FN_STR_OCTET_LENGTH): likewise.
	(SQL_FN_STR_POSITION): likewise.
	(SQL_FN_TD_CURRENT_DATE): likewise.
	(SQL_FN_TD_CURRENT_TIME): likewise.
	(SQL_FN_TD_CURRENT_TIMESTAMP): likewise.
	(SQL_FN_TD_EXTRACT): likewise.
	(SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1): likewise.
	(SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2): likewise.
	(SQL_FUNC_EXISTS(exists,api)): likewise.
	(SQL_GB_COLLATE): likewise.
	(SQL_HANDLE_SENV): likewise.
	(SQL_IK_ALL): likewise.
	(SQL_IK_ASC): likewise.
	(SQL_IK_DESC): likewise.
	(SQL_IK_NONE): likewise.
	(SQL_INDEX_KEYWORDS): likewise.
	(SQL_INFO_DRIVER_START): likewise.
	(SQL_INFO_LAST): likewise.
	(SQL_INFO_SCHEMA_VIEWS): likewise.
	(SQL_INITIALLY_DEFERRED): likewise.
	(SQL_INITIALLY_IMMEDIATE): likewise.
	(SQL_INSERT_STATEMENT): likewise.
	(SQL_INTERVAL): likewise.
	(SQL_IS_INSERT_LITERALS): likewise.
	(SQL_IS_INSERT_SEARCHED): likewise.
	(SQL_IS_INTEGER): likewise.
	(SQL_IS_POINTER): likewise.
	(SQL_IS_SELECT_INTO): likewise.
	(SQL_IS_SMALLINT): likewise.
	(SQL_IS_UINTEGER): likewise.
	(SQL_IS_USMALLINT): likewise.
	(SQL_ISV_ASSERTIONS): likewise.
	(SQL_ISV_CHARACTER_SETS): likewise.
	(SQL_ISV_CHECK_CONSTRAINTS): likewise.
	(SQL_ISV_COLLATIONS): likewise.
	(SQL_ISV_COLUMN_DOMAIN_USAGE): likewise.
	(SQL_ISV_COLUMN_PRIVILEGES): likewise.
	(SQL_ISV_COLUMNS): likewise.
	(SQL_ISV_CONSTRAINT_COLUMN_USAGE): likewise.
	(SQL_ISV_CONSTRAINT_TABLE_USAGE): likewise.
	(SQL_ISV_DOMAIN_CONSTRAINTS): likewise.
	(SQL_ISV_DOMAINS): likewise.
	(SQL_ISV_KEY_COLUMN_USAGE): likewise.
	(SQL_ISV_REFERENTIAL_CONSTRAINTS): likewise.
	(SQL_ISV_SCHEMATA): likewise.
	(SQL_ISV_SQL_LANGUAGES): likewise.
	(SQL_ISV_TABLE_CONSTRAINTS): likewise.
	(SQL_ISV_TABLE_PRIVILEGES): likewise.
	(SQL_ISV_TABLES): likewise.
	(SQL_ISV_TRANSLATIONS): likewise.
	(SQL_ISV_USAGE_PRIVILEGES): likewise.
	(SQL_ISV_VIEW_COLUMN_USAGE): likewise.
	(SQL_ISV_VIEW_TABLE_USAGE): likewise.
	(SQL_ISV_VIEWS): likewise.
	(SQL_KEYSET_CURSOR_ATTRIBUTES1): likewise.
	(SQL_KEYSET_CURSOR_ATTRIBUTES2): likewise.
	(SQL_MAX_ASYNC_CONCURRENT_STATEMENTS): likewise.
	(SQL_NO_COLUMN_NUMBER): likewise.
	(SQL_NO_ROW_NUMBER): likewise.
	(SQL_NOT_DEFERRABLE): likewise.
	(SQL_NUM_EXTENSIONS): likewise.
	(SQL_NUM_FUNCTIONS): likewise.
	(SQL_ODBC_INTERFACE_CONFORMANCE): likewise.
	(SQL_OIC_CORE): likewise.
	(SQL_OIC_LEVEL1): likewise.
	(SQL_OIC_LEVEL2): likewise.
	(SQL_OV_ODBC2): likewise.
	(SQL_OV_ODBC3): likewise.
	(SQL_PARAM_ARRAY_ROW_COUNTS): likewise.
	(SQL_PARAM_ARRAY_SELECTS): likewise.
	(SQL_PARAM_BIND_BY_COLUMN): likewise.
	(SQL_PARAM_BIND_TYPE_DEFAULT): likewise.
	(SQL_PARAM_DIAG_UNAVAILABLE): likewise.
	(SQL_PARAM_ERROR): likewise.
	(SQL_PARAM_IGNORE): likewise.
	(SQL_PARAM_PROCEED): likewise.
	(SQL_PARAM_SUCCESS): likewise.
	(SQL_PARAM_SUCCESS_WITH_INFO): likewise.
	(SQL_PARAM_UNUSED): likewise.
	(SQL_PARC_BATCH): likewise.
	(SQL_PARC_NO_BATCH): likewise.
	(SQL_PAS_BATCH): likewise.
	(SQL_PAS_NO_BATCH): likewise.
	(SQL_PAS_NO_SELECT): likewise.
	(SQL_ROW_IGNORE): likewise.
	(SQL_ROW_NUMBER_UNKNOWN): likewise.
	(SQL_ROW_PROCEED): likewise.
	(SQL_ROW_SUCCESS_WITH_INFO): likewise.
	(SQL_SC_FIPS127_2_TRANSITIONAL): likewise.
	(SQL_SC_SQL92_ENTRY): likewise.
	(SQL_SC_SQL92_FULL): likewise.
	(SQL_SC_SQL92_INTERMEDIATE): likewise.
	(SQL_SCC_ISO92_CLI): likewise.
	(SQL_SCC_XOPEN_CLI_VERSION1): likewise.
	(SQL_SCHEMA_TERM): likewise.
	(SQL_SCHEMA_USAGE): likewise.
	(SQL_SDF_CURRENT_DATE): likewise.
	(SQL_SDF_CURRENT_TIME): likewise.
	(SQL_SDF_CURRENT_TIMESTAMP): likewise.
	(SQL_SFKD_CASCADE): likewise.
	(SQL_SFKD_NO_ACTION): likewise.
	(SQL_SFKD_SET_DEFAULT): likewise.
	(SQL_SFKD_SET_NULL): likewise.
	(SQL_SFKU_CASCADE): likewise.
	(SQL_SFKU_NO_ACTION): likewise.
	(SQL_SFKU_SET_DEFAULT): likewise.
	(SQL_SFKU_SET_NULL): likewise.
	(SQL_SG_DELETE_TABLE): likewise.
	(SQL_SG_INSERT_COLUMN): likewise.
	(SQL_SG_INSERT_TABLE): likewise.
	(SQL_SG_REFERENCES_COLUMN): likewise.
	(SQL_SG_REFERENCES_TABLE): likewise.
	(SQL_SG_SELECT_TABLE): likewise.
	(SQL_SG_UPDATE_COLUMN): likewise.
	(SQL_SG_UPDATE_TABLE): likewise.
	(SQL_SG_USAGE_ON_CHARACTER_SET): likewise.
	(SQL_SG_USAGE_ON_COLLATION): likewise.
	(SQL_SG_USAGE_ON_DOMAIN): likewise.
	(SQL_SG_USAGE_ON_TRANSLATION): likewise.
	(SQL_SG_WITH_GRANT_OPTION): likewise.
	(SQL_SNVF_BIT_LENGTH): likewise.
	(SQL_SNVF_CHAR_LENGTH): likewise.
	(SQL_SNVF_CHARACTER_LENGTH): likewise.
	(SQL_SNVF_EXTRACT): likewise.
	(SQL_SNVF_OCTET_LENGTH): likewise.
	(SQL_SNVF_POSITION): likewise.
	(SQL_SP_BETWEEN): likewise.
	(SQL_SP_COMPARISON): likewise.
	(SQL_SP_EXISTS): likewise.
	(SQL_SP_IN): likewise.
	(SQL_SP_ISNOTNULL): likewise.
	(SQL_SP_ISNULL): likewise.
	(SQL_SP_LIKE): likewise.
	(SQL_SP_MATCH_FULL): likewise.
	(SQL_SP_MATCH_PARTIAL): likewise.
	(SQL_SP_MATCH_UNIQUE_FULL): likewise.
	(SQL_SP_MATCH_UNIQUE_PARTIAL): likewise.
	(SQL_SP_OVERLAPS): likewise.
	(SQL_SP_QUANTIFIED_COMPARISON): likewise.
	(SQL_SP_UNIQUE): likewise.
	(SQL_SQL_CONFORMANCE): likewise.
	(SQL_SQL92_DATETIME_FUNCTIONS): likewise.
	(SQL_SQL92_FOREIGN_KEY_DELETE_RULE): likewise.
	(SQL_SQL92_FOREIGN_KEY_UPDATE_RULE): likewise.
	(SQL_SQL92_GRANT): likewise.
	(SQL_SQL92_NUMERIC_VALUE_FUNCTIONS): likewise.
	(SQL_SQL92_PREDICATES): likewise.
	(SQL_SQL92_RELATIONAL_JOIN_OPERATORS): likewise.
	(SQL_SQL92_REVOKE): likewise.
	(SQL_SQL92_ROW_VALUE_CONSTRUCTOR): likewise.
	(SQL_SQL92_STRING_FUNCTIONS): likewise.
	(SQL_SQL92_VALUE_EXPRESSIONS): likewise.
	(SQL_SR_CASCADE): likewise.
	(SQL_SR_DELETE_TABLE): likewise.
	(SQL_SR_GRANT_OPTION_FOR): likewise.
	(SQL_SR_INSERT_COLUMN): likewise.
	(SQL_SR_INSERT_TABLE): likewise.
	(SQL_SR_REFERENCES_COLUMN): likewise.
	(SQL_SR_REFERENCES_TABLE): likewise.
	(SQL_SR_RESTRICT): likewise.
	(SQL_SR_SELECT_TABLE): likewise.
	(SQL_SR_UPDATE_COLUMN): likewise.
	(SQL_SR_UPDATE_TABLE): likewise.
	(SQL_SR_USAGE_ON_CHARACTER_SET): likewise.
	(SQL_SR_USAGE_ON_COLLATION): likewise.
	(SQL_SR_USAGE_ON_DOMAIN): likewise.
	(SQL_SR_USAGE_ON_TRANSLATION): likewise.
	(SQL_SRJO_CORRESPONDING_CLAUSE): likewise.
	(SQL_SRJO_CROSS_JOIN): likewise.
	(SQL_SRJO_EXCEPT_JOIN): likewise.
	(SQL_SRJO_FULL_OUTER_JOIN): likewise.
	(SQL_SRJO_INNER_JOIN): likewise.
	(SQL_SRJO_INTERSECT_JOIN): likewise.
	(SQL_SRJO_LEFT_OUTER_JOIN): likewise.
	(SQL_SRJO_NATURAL_JOIN): likewise.
	(SQL_SRJO_RIGHT_OUTER_JOIN): likewise.
	(SQL_SRJO_UNION_JOIN): likewise.
	(SQL_SRVC_DEFAULT): likewise.
	(SQL_SRVC_NULL): likewise.
	(SQL_SRVC_ROW_SUBQUERY): likewise.
	(SQL_SRVC_VALUE_EXPRESSION): likewise.
	(SQL_SSF_CONVERT): likewise.
	(SQL_SSF_LOWER): likewise.
	(SQL_SSF_SUBSTRING): likewise.
	(SQL_SSF_TRANSLATE): likewise.
	(SQL_SSF_TRIM_BOTH): likewise.
	(SQL_SSF_TRIM_LEADING): likewise.
	(SQL_SSF_TRIM_TRAILING): likewise.
	(SQL_SSF_UPPER): likewise.
	(SQL_STANDARD_CLI_CONFORMANCE): likewise.
	(SQL_STATIC_CURSOR_ATTRIBUTES1): likewise.
	(SQL_STATIC_CURSOR_ATTRIBUTES2): likewise.
	(SQL_SU_DML_STATEMENTS): likewise.
	(SQL_SU_INDEX_DEFINITION): likewise.
	(SQL_SU_PRIVILEGE_DEFINITION): likewise.
	(SQL_SU_PROCEDURE_INVOCATION): likewise.
	(SQL_SU_TABLE_DEFINITION): likewise.
	(SQL_SVE_CASE): likewise.
	(SQL_SVE_CAST): likewise.
	(SQL_SVE_COALESCE): likewise.
	(SQL_SVE_NULLIF): likewise.
	(SQL_UB_FIXED): likewise.
	(SQL_UB_VARIABLE): likewise.
	(SQL_UNION_STATEMENT): likewise.
	(SQL_UPDATE_BY_BOOKMARK): likewise.
	(SQL_US_UNION): likewise.
	(SQL_US_UNION_ALL): likewise.
	(SQL_DESC_ROWVER): likewise.
	(SQL_GUID): likewise.
	(SQL_C_GUID): likewise.
	(ODBC_STD): likewise.
	(SQLAllocHandle): likewise.
	(SQLAllocEnv(p)): likewise.
	(SQL_YEAR): likewise.
	(SQL_MONTH): likewise.
	(SQL_DAY): likewise.
	(SQL_HOUR): likewise.
	(SQL_MINUTE): likewise.
	(SQL_SECOND): likewise.
	(SQL_YEAR_TO_MONTH): likewise.
	(SQL_DAY_TO_HOUR): likewise.
	(SQL_DAY_TO_MINUTE): likewise.
	(SQL_DAY_TO_SECOND): likewise.
	(SQL_HOUR_TO_MINUTE): likewise.
	(SQL_HOUR_TO_SECOND): likewise.
	(SQL_MINUTE_TO_SECOND): likewise.
	(SQL_ATTR_ANSI_APP): likewise.
	(SQL_AA_TRUE): likewise.
	(SQL_AA_FALSE): likewise.

	* include/sqltypes.h (#pragma pack(push,1), #pragma pack(pop)): remove.
	(struct tagSQL_YEAR_MONTH): add for ODBC3.x.
	(struct tagSQL_DAY_SECOND): likewise.
	(struct	tagSQL_INTERVAL_STRUCT): likewise.
	(struct tagSQL_NUMERIC_STRUCT): likewise.
	(struct tagSQLGUID): add for 0DBC3.50.
	(enum SQLINTERVAL): add for ODBC3.x.
	(SQLWCHAR): add typedef.
	(SQLTCHAR): add typedef, conditional on UNICODE.
	(SQLLEN): add typedef for _WIN64, define for _WIN32.
	(SQLULEN): likewise.
	(SQLROWOFFSET): likewise.
	(SQLROWCOUNT): likewise.
	(SQLTRANSID): likewise.
	(SQLSETPOSIROW): likewise.
	(SQLHANDLE): add ODBC3.x typedef.
	(SQLHDESC): likewise.
	(SQLDATE): likewise.
	(SQLDECIMAL): likewise.
	(SQLDOUBLE): likewise.
	(SQLFLOAT): likewise.
	(SQLNUMERIC): likewise.
	(SQLREAL): likewise.
	(SQLTIME): likewise.
	(SQLTIMESTAMP): likewise.
	(SQLVARCHAR): likewise.
	(SQLBIGINT): likewise.
	(SQLUBIGINT): likewise.
	(SQL_DATE_STRUCT): likewise.
	(SQL_TIME_STRUCT): likewise.
	(SQL_TIMESTAMP_STRUCT): likewise.
	(ODBCINT64): add ODBC3.x define.

	* lib/odbc32.def : regenerate.

5 files changed, 2909 insertions, 587 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index bd6a052bd..153ac7fe2 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,4 +1,1274 @@
 
+Sun Jan 28 11:16:39  2001  Earnie Boyd  <earnie@users.sourceforge.net>
+
+	* Apply Danny Smith patch 102446
+	2000-11-20  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
+	* include/sql.h (ODBCVER): change default to 0x0351.
+	(SQLSetScrollOptions): non-core function, move prototype to sqlext.h.
+	(SQLColAttributes): likewise.
+	(SQLBindParam): add prototype for ODBC 3.x function.
+	(SQLCloseCursor): likewise.
+	(SQLColAttribute): likewise.
+	(SQLCopyDesc):likewise.
+	(SQLEndTran): likewise.
+	(SQLFetchScroll): likewise.
+	(SQLGetConnectAttr): likewise.
+	(SQLGetDescField): likewise.
+	(SQLGetDescRec): likewise.
+	(SQLGetDiagField): likewise.
+	(SQLGetDiagRec): likewise.
+	(SQLGetEnvAttr): likewise.
+	(SQLGetStmtAttr): likewise.
+	(SQLSetConnectAttr): likewise.
+	(SQLSetDescField):likewise.
+	(SQLSetDescRec): likewise.
+	(SQLSetEnvAttr): likewise.
+	(SQLSetStmtAttr): likewise.
+	(SQLINTENGER and SQLUINTEGER): replace with SQLLEN and SQLULEN for 
+	_WIN64 compatability; 
+	(SQL_ACCESS_MODE): Move define to sqlext.h (used in non-core functions).
+	(SQL_ACTIVE_CONNECTIONS): likewise.
+	(SQL_ACTIVE_STATEMENTS): likewise.
+	(SQL_ALL_EXCEPT_LIKE): likewise.
+	(SQL_API_ALL_FUNCTIONS): likewise.
+	(SQL_API_LOADBYORDINAL): likewise.
+	(SQL_API_SQLBINDPARAMETER): likewise.
+	(SQL_API_SQLBROWSECONNECT): likewise.
+	(SQL_API_SQLCOLATTRIBUTES): likewise.
+	(SQL_API_SQLCOLUMNPRIVILEGES): likewise.
+	(SQL_API_SQLDESCRIBEPARAM): likewise.
+	(SQL_API_SQLDRIVERCONNECT): likewise.
+	(SQL_API_SQLDRIVERS): likewise.
+	(SQL_API_SQLEXTENDEDFETCH): likewise.
+	(SQL_API_SQLFOREIGNKEYS): likewise.
+	(SQL_API_SQLMORERESULTS): likewise.
+	(SQL_API_SQLNATIVESQL): likewise.
+	(SQL_API_SQLNUMPARAMS): likewise.
+	(SQL_API_SQLPARAMOPTIONS): likewise.
+	(SQL_API_SQLPRIMARYKEYS): likewise.
+	(SQL_API_SQLPROCEDURECOLUMNS): likewise.
+	(SQL_API_SQLPROCEDURES): likewise.
+	(SQL_API_SQLSETPOS): likewise.
+	(SQL_API_SQLSETSCROLLOPTIONS): likewise.
+	(SQL_API_SQLTABLEPRIVILEGES): likewise.
+	(SQL_ASYNC_ENABLE): likewise.
+	(SQL_ASYNC_ENABLE_DEFAULT): likewise.
+	(SQL_ASYNC_ENABLE_OFF): likewise.
+	(SQL_ASYNC_ENABLE_ON): likewise.
+	(SQL_ATTR_READONLY): likewise.
+	(SQL_ATTR_READWRITE_UNKNOWN): likewise.
+	(SQL_ATTR_WRITE): likewise.
+	(SQL_AUTOCOMMIT): likewise.
+	(SQL_AUTOCOMMIT_DEFAULT): likewise.
+	(SQL_AUTOCOMMIT_OFF): likewise.
+	(SQL_AUTOCOMMIT_ON): likewise.
+	(SQL_BEST_ROWID): likewise.
+	(SQL_BIGINT): likewise.
+	(SQL_BINARY): likewise.
+	(SQL_BIND_BY_COLUMN): likewise.
+	(SQL_BIND_TYPE): likewise.
+	(SQL_BIND_TYPE_DEFAULT): likewise.
+	(SQL_BIT): likewise.
+	(SQL_BOOKMARK_PERSISTENCE): likewise.
+	(SQL_BP_CLOSE): likewise.
+	(SQL_BP_DELETE): likewise.
+	(SQL_BP_DROP): likewise.
+	(SQL_BP_OTHER_HSTMT): likewise.
+	(SQL_BP_SCROLL): likewise.
+	(SQL_BP_TRANSACTION): likewise.
+	(SQL_BP_UPDATE): likewise.
+	(SQL_C_BINARY): likewise.
+	(SQL_C_BIT): likewise.
+	(SQL_C_BOOKMARK): likewise.
+	(SQL_C_CHAR): likewise.
+	(SQL_C_DATE): likewise.
+	(SQL_C_DEFAULT): likewise.
+	(SQL_C_DOUBLE): likewise.
+	(SQL_C_FLOAT): likewise.
+	(SQL_C_LONG): likewise.
+	(SQL_C_SHORT): likewise.
+	(SQL_C_SLONG): likewise.
+	(SQL_C_SSHORT): likewise.
+	(SQL_C_STINYINT): likewise.
+	(SQL_C_TIME): likewise.
+	(SQL_C_TIMESTAMP): likewise.
+	(SQL_C_TINYINT): likewise.
+	(SQL_C_ULONG): likewise.
+	(SQL_C_USHORT): likewise.
+	(SQL_C_UTINYINT): likewise.
+	(SQL_CB_NON_NULL): likewise.
+	(SQL_CB_NULL): likewise.
+	(SQL_CC_CLOSE): likewise.
+	(SQL_CC_DELETE): likewise.
+	(SQL_CC_PRESERVE): likewise.
+	(SQL_CN_ANY): likewise.
+	(SQL_CN_DIFFERENT): likewise.
+	(SQL_CN_NONE): likewise.
+	(SQL_COLATT_OPT_MAX): likewise.
+	(SQL_COLATT_OPT_MIN): likewise.
+	(SQL_COLUMN_ALIAS): likewise.
+	(SQL_COLUMN_AUTO_INCREMENT): likewise.
+	(SQL_COLUMN_CASE_SENSITIVE): likewise.
+	(SQL_COLUMN_COUNT): likewise.
+	(SQL_COLUMN_DISPLAY_SIZE): likewise.
+	(SQL_COLUMN_DRIVER_START): likewise.
+	(SQL_COLUMN_LABEL): likewise.
+	(SQL_COLUMN_LENGTH): likewise.
+	(SQL_COLUMN_MONEY): likewise.
+	(SQL_COLUMN_NAME): likewise.
+	(SQL_COLUMN_NULLABLE): likewise.
+	(SQL_COLUMN_OWNER_NAME): likewise.
+	(SQL_COLUMN_PRECISION): likewise.
+	(SQL_COLUMN_QUALIFIER_NAME): likewise.
+	(SQL_COLUMN_SCALE): likewise.
+	(SQL_COLUMN_SEARCHABLE): likewise.
+	(SQL_COLUMN_TABLE_NAME): likewise.
+	(SQL_COLUMN_TYPE): likewise.
+	(SQL_COLUMN_TYPE_NAME): likewise.
+	(SQL_COLUMN_UNSIGNED): likewise.
+	(SQL_COLUMN_UPDATABLE): likewise.
+	(SQL_CONCAT_NULL_BEHAVIOR): likewise.
+	(SQL_CONCUR_DEFAULT): likewise.
+	(SQL_CONCUR_LOCK): likewise.
+	(SQL_CONCUR_READ_ONLY): likewise.
+	(SQL_CONCUR_ROWVER): likewise.
+	(SQL_CONCUR_TIMESTAMP): likewise.
+	(SQL_CONCUR_VALUES): likewise.
+	(SQL_CONCURRENCY): likewise.
+	(SQL_CONN_OPT_MAX): likewise.
+	(SQL_CONN_OPT_MIN): likewise.
+	(SQL_CONNECT_OPT_DRVR_START): likewise.
+	(SQL_CONVERT_BIGINT): likewise.
+	(SQL_CONVERT_BINARY): likewise.
+	(SQL_CONVERT_BIT): likewise.
+	(SQL_CONVERT_CHAR): likewise.
+	(SQL_CONVERT_DATE): likewise.
+	(SQL_CONVERT_DECIMAL): likewise.
+	(SQL_CONVERT_DOUBLE): likewise.
+	(SQL_CONVERT_FLOAT): likewise.
+	(SQL_CONVERT_FUNCTIONS): likewise.
+	(SQL_CONVERT_INTEGER): likewise.
+	(SQL_CONVERT_LONGVARBINARY): likewise.
+	(SQL_CONVERT_LONGVARCHAR): likewise.
+	(SQL_CONVERT_NUMERIC): likewise.
+	(SQL_CONVERT_REAL): likewise.
+	(SQL_CONVERT_SMALLINT): likewise.
+	(SQL_CONVERT_TIME): likewise.
+	(SQL_CONVERT_TIMESTAMP): likewise.
+	(SQL_CONVERT_TINYINT): likewise.
+	(SQL_CONVERT_VARBINARY): likewise.
+	(SQL_CONVERT_VARCHAR): likewise.
+	(SQL_CORRELATION_NAME): likewise.
+	(SQL_CR_CLOSE): likewise.
+	(SQL_CR_DELETE): likewise.
+	(SQL_CR_PRESERVE): likewise.
+	(SQL_CUR_DEFAULT): likewise.
+	(SQL_CUR_USE_DRIVER): likewise.
+	(SQL_CUR_USE_IF_NEEDED): likewise.
+	(SQL_CUR_USE_ODBC): likewise.
+	(SQL_CURRENT_QUALIFIER): likewise.
+	(SQL_CURSOR_DYNAMIC): likewise.
+	(SQL_CURSOR_FORWARD_ONLY): likewise.
+	(SQL_CURSOR_KEYSET_DRIVEN): likewise.
+	(SQL_CURSOR_ROLLBACK_BEHAVIOR): likewise.
+	(SQL_CURSOR_STATIC): likewise.
+	(SQL_CURSOR_TYPE): likewise.
+	(SQL_CURSOR_TYPE_DEFAULT): likewise.
+	(SQL_CVT_BIGINT): likewise.
+	(SQL_CVT_BINARY): likewise.
+	(SQL_CVT_BIT): likewise.
+	(SQL_CVT_CHAR): likewise.
+	(SQL_CVT_DATE): likewise.
+	(SQL_CVT_DECIMAL): likewise.
+	(SQL_CVT_DOUBLE): likewise.
+	(SQL_CVT_FLOAT): likewise.
+	(SQL_CVT_INTEGER): likewise.
+	(SQL_CVT_LONGVARBINARY): likewise.
+	(SQL_CVT_LONGVARCHAR): likewise.
+	(SQL_CVT_NUMERIC): likewise.
+	(SQL_CVT_REAL): likewise.
+	(SQL_CVT_SMALLINT): likewise.
+	(SQL_CVT_TIME): likewise.
+	(SQL_CVT_TIMESTAMP): likewise.
+	(SQL_CVT_TINYINT): likewise.
+	(SQL_CVT_VARBINARY): likewise.
+	(SQL_CVT_VARCHAR): likewise.
+	(SQL_DATABASE_NAME): likewise.
+	(SQL_DATE): likewise.
+	(SQL_DRIVER_HDBC): likewise.
+	(SQL_DRIVER_HENV): likewise.
+	(SQL_DRIVER_HLIB): likewise.
+	(SQL_DRIVER_HSTMT): likewise.
+	(SQL_DRIVER_NAME): likewise.
+	(SQL_DRIVER_ODBC_VER): likewise.
+	(SQL_DRIVER_VER): likewise.
+	(SQL_ENSURE): likewise.
+	(SQL_EXPRESSIONS_IN_ORDERBY): likewise.
+	(SQL_EXT_API_LAST): likewise.
+	(SQL_EXT_API_START): likewise.
+	(SQL_FD_FETCH_BOOKMARK): likewise.
+	(SQL_FD_FETCH_PREV): likewise.
+	(SQL_FD_FETCH_RESUME): likewise.
+	(SQL_FETCH_PREV): likewise.
+	(SQL_FETCH_RESUME): likewise.
+	(SQL_FILE_NOT_SUPPORTED): likewise.
+	(SQL_FILE_QUALIFIER): likewise.
+	(SQL_FILE_TABLE): likewise.
+	(SQL_FILE_USAGE): likewise.
+	(SQL_FN_CVT_CONVERT): likewise.
+	(SQL_FN_NUM_ABS): likewise.
+	(SQL_FN_NUM_ACOS): likewise.
+	(SQL_FN_NUM_ASIN): likewise.
+	(SQL_FN_NUM_ATAN): likewise.
+	(SQL_FN_NUM_ATAN2): likewise.
+	(SQL_FN_NUM_CEILING): likewise.
+	(SQL_FN_NUM_COS): likewise.
+	(SQL_FN_NUM_COT): likewise.
+	(SQL_FN_NUM_DEGREES): likewise.
+	(SQL_FN_NUM_EXP): likewise.
+	(SQL_FN_NUM_FLOOR): likewise.
+	(SQL_FN_NUM_LOG): likewise.
+	(SQL_FN_NUM_LOG10): likewise.
+	(SQL_FN_NUM_MOD): likewise.
+	(SQL_FN_NUM_PI): likewise.
+	(SQL_FN_NUM_POWER): likewise.
+	(SQL_FN_NUM_RADIANS): likewise.
+	(SQL_FN_NUM_RAND): likewise.
+	(SQL_FN_NUM_ROUND): likewise.
+	(SQL_FN_NUM_SIGN): likewise.
+	(SQL_FN_NUM_SIN): likewise.
+	(SQL_FN_NUM_SQRT): likewise.
+	(SQL_FN_NUM_TAN): likewise.
+	(SQL_FN_NUM_TRUNCATE): likewise.
+	(SQL_FN_STR_ASCII): likewise.
+	(SQL_FN_STR_CHAR): likewise.
+	(SQL_FN_STR_CONCAT): likewise.
+	(SQL_FN_STR_DIFFERENCE): likewise.
+	(SQL_FN_STR_INSERT): likewise.
+	(SQL_FN_STR_LCASE): likewise.
+	(SQL_FN_STR_LEFT): likewise.
+	(SQL_FN_STR_LENGTH): likewise.
+	(SQL_FN_STR_LOCATE): likewise.
+	(SQL_FN_STR_LOCATE_2): likewise.
+	(SQL_FN_STR_LTRIM): likewise.
+	(SQL_FN_STR_REPEAT): likewise.
+	(SQL_FN_STR_REPLACE): likewise.
+	(SQL_FN_STR_RIGHT): likewise.
+	(SQL_FN_STR_RTRIM): likewise.
+	(SQL_FN_STR_SOUNDEX): likewise.
+	(SQL_FN_STR_SPACE): likewise.
+	(SQL_FN_STR_SUBSTRING): likewise.
+	(SQL_FN_STR_UCASE): likewise.
+	(SQL_FN_SYS_DBNAME): likewise.
+	(SQL_FN_SYS_IFNULL): likewise.
+	(SQL_FN_SYS_USERNAME): likewise.
+	(SQL_FN_TD_CURDATE): likewise.
+	(SQL_FN_TD_CURTIME): likewise.
+	(SQL_FN_TD_DAYNAME): likewise.
+	(SQL_FN_TD_DAYOFMONTH): likewise.
+	(SQL_FN_TD_DAYOFWEEK): likewise.
+	(SQL_FN_TD_DAYOFYEAR): likewise.
+	(SQL_FN_TD_HOUR): likewise.
+	(SQL_FN_TD_MINUTE): likewise.
+	(SQL_FN_TD_MONTH): likewise.
+	(SQL_FN_TD_MONTHNAME): likewise.
+	(SQL_FN_TD_NOW): likewise.
+	(SQL_FN_TD_QUARTER): likewise.
+	(SQL_FN_TD_SECOND): likewise.
+	(SQL_FN_TD_TIMESTAMPadd): likewise.
+	(SQL_FN_TD_TIMESTAMPDIFF): likewise.
+	(SQL_FN_TD_WEEK): likewise.
+	(SQL_FN_TD_YEAR): likewise.
+	(SQL_FN_TSI_DAY): likewise.
+	(SQL_FN_TSI_FRAC_SECOND): likewise.
+	(SQL_FN_TSI_HOUR): likewise.
+	(SQL_FN_TSI_MINUTE): likewise.
+	(SQL_FN_TSI_MONTH): likewise.
+	(SQL_FN_TSI_QUARTER): likewise.
+	(SQL_FN_TSI_SECOND): likewise.
+	(SQL_FN_TSI_WEEK): likewise.
+	(SQL_FN_TSI_YEAR): likewise.
+	(SQL_GB_GROUP_BY_CONTAINS_SELECT): likewise.
+	(SQL_GB_GROUP_BY_EQUALS_SELECT): likewise.
+	(SQL_GB_NO_RELATION): likewise.
+	(SQL_GB_NOT_SUPPORTED): likewise.
+	(SQL_GD_BLOCK): likewise.
+	(SQL_GD_BOUND): likewise.
+	(SQL_GET_BOOKMARK): likewise.
+	(SQL_GROUP_BY): likewise.
+	(SQL_INFO_DRIVER_START): likewise.
+	(SQL_INFO_FIRST): likewise.
+	(SQL_INFO_LAST): likewise.
+	(SQL_INTERVAL_DAY): likewise.
+	(SQL_INTERVAL_DAY_TO_HOUR): likewise.
+	(SQL_INTERVAL_DAY_TO_MINUTE): likewise.
+	(SQL_INTERVAL_DAY_TO_SECOND): likewise.
+	(SQL_INTERVAL_HOUR): likewise.
+	(SQL_INTERVAL_HOUR_TO_MINUTE): likewise.
+	(SQL_INTERVAL_HOUR_TO_SECOND): likewise.
+	(SQL_INTERVAL_MINUTE): likewise.
+	(SQL_INTERVAL_MINUTE_TO_SECOND): likewise.
+	(SQL_INTERVAL_MONTH): likewise.
+	(SQL_INTERVAL_SECOND): likewise.
+	(SQL_INTERVAL_YEAR): likewise.
+	(SQL_INTERVAL_YEAR_TO_MONTH): likewise.
+	(SQL_KEYSET_SIZE): likewise.
+	(SQL_KEYSET_SIZE_DEFAULT): likewise.
+	(SQL_KEYWORDS): likewise.
+	(SQL_LCK_EXCLUSIVE): likewise.
+	(SQL_LCK_NO_CHANGE): likewise.
+	(SQL_LCK_UNLOCK): likewise.
+	(SQL_LIKE_ESCAPE_CLAUSE): likewise.
+	(SQL_LIKE_ONLY): likewise.
+	(SQL_LOCK_TYPES): likewise.
+	(SQL_LOGIN_TIMEOUT): likewise.
+	(SQL_LOGIN_TIMEOUT_DEFAULT): likewise.
+	(SQL_LONGVARBINARY): likewise.
+	(SQL_LONGVARCHAR): likewise.
+	(SQL_MAX_BINARY_LITERAL_LEN): likewise.
+	(SQL_MAX_CHAR_LITERAL_LEN): likewise.
+	(SQL_MAX_DSN_LENGTH): likewise.
+	(SQL_MAX_LENGTH): likewise.
+	(SQL_MAX_LENGTH_DEFAULT): likewise.
+	(SQL_MAX_OPTION_STRING_LENGTH): likewise.
+	(SQL_MAX_OWNER_NAME_LEN): likewise.
+	(SQL_MAX_PROCEDURE_NAME_LEN): likewise.
+	(SQL_MAX_QUALIFIER_NAME_LEN): likewise.
+	(SQL_MAX_ROW_SIZE_INCLUDES_LONG): likewise.
+	(SQL_MAX_ROWS): likewise.
+	(SQL_MAX_ROWS_DEFAULT): likewise.
+	(SQL_MODE_DEFAULT): likewise.
+	(SQL_MODE_READ_ONLY): likewise.
+	(SQL_MODE_READ_WRITE): likewise.
+	(SQL_MULT_RESULT_SETS): likewise.
+	(SQL_MULTIPLE_ACTIVE_TXN): likewise.
+	(SQL_NC_END): likewise.
+	(SQL_NC_START): likewise.
+	(SQL_NEED_LONG_DATA_LEN): likewise.
+	(SQL_NNC_NON_NULL): likewise.
+	(SQL_NNC_NULL): likewise.
+	(SQL_NO_TOTAL): likewise.
+	(SQL_NON_NULLABLE_COLUMNS): likewise.
+	(SQL_NOSCAN): likewise.
+	(SQL_NOSCAN_DEFAULT): likewise.
+	(SQL_NOSCAN_OFF): likewise.
+	(SQL_NOSCAN_ON): likewise.
+	(SQL_NUM_EXTENSIONS): likewise.
+	(SQL_NUM_FUNCTIONS): likewise.
+	(SQL_NUMERIC_FUNCTIONS): likewise.
+	(SQL_OAC_LEVEL1): likewise.
+	(SQL_OAC_LEVEL2): likewise.
+	(SQL_OAC_NONE): likewise.
+	(SQL_ODBC_API_CONFORMANCE): likewise.
+	(SQL_ODBC_CURSORS): likewise.
+	(SQL_ODBC_KEYWORDS): likewise.
+	(SQL_ODBC_SAG_CLI_CONFORMANCE): likewise.
+	(SQL_ODBC_SQL_CONFORMANCE): likewise.
+	(SQL_ODBC_SQL_OPT_IEF): likewise.
+	(SQL_ODBC_VER): likewise.
+	(SQL_OPT_TRACE): likewise.
+	(SQL_OPT_TRACE_DEFAULT): likewise.
+	(SQL_OPT_TRACE_FILE_DEFAULT): likewise.
+	(SQL_OPT_TRACE_OFF): likewise.
+	(SQL_OPT_TRACE_ON): likewise.
+	(SQL_OPT_TRACEFILE): likewise.
+	(SQL_OSC_CORE): likewise.
+	(SQL_OSC_EXTENDED): likewise.
+	(SQL_OSC_MINIMUM): likewise.
+	(SQL_OSCC_COMPLIANT): likewise.
+	(SQL_OSCC_NOT_COMPLIANT): likewise.
+	(SQL_OU_DML_STATEMENTS): likewise.
+	(SQL_OU_INDEX_DEFINITION): likewise.
+	(SQL_OU_PRIVILEGE_DEFINITION): likewise.
+	(SQL_OU_PROCEDURE_INVOCATION): likewise.
+	(SQL_OU_TABLE_DEFINITION): likewise.
+	(SQL_OUTER_JOINS): likewise.
+	(SQL_OWNER_TERM): likewise.
+	(SQL_OWNER_USAGE): likewise.
+	(SQL_PACKET_SIZE): likewise.
+	(SQL_PC_NOT_PSEUDO): likewise.
+	(SQL_POS_add): likewise.
+	(SQL_POS_DELETE): likewise.
+	(SQL_POS_OPERATIONS): likewise.
+	(SQL_POS_POSITION): likewise.
+	(SQL_POS_REFRESH): likewise.
+	(SQL_POS_UPDATE): likewise.
+	(SQL_POSITIONED_STATEMENTS): likewise.
+	(SQL_PROCEDURE_TERM): likewise.
+	(SQL_PROCEDURES): likewise.
+	(SQL_PS_POSITIONED_DELETE): likewise.
+	(SQL_PS_POSITIONED_UPDATE): likewise.
+	(SQL_PS_SELECT_FOR_UPDATE): likewise.
+	(SQL_QL_END): likewise.
+	(SQL_QL_START): likewise.
+	(SQL_QU_DML_STATEMENTS): likewise.
+	(SQL_QU_INDEX_DEFINITION): likewise.
+	(SQL_QU_PRIVILEGE_DEFINITION): likewise.
+	(SQL_QU_PROCEDURE_INVOCATION): likewise.
+	(SQL_QU_TABLE_DEFINITION): likewise.
+	(SQL_QUALIFIER_LOCATION): likewise.
+	(SQL_QUALIFIER_NAME_SEPARATOR): likewise.
+	(SQL_QUALIFIER_TERM): likewise.
+	(SQL_QUALIFIER_USAGE): likewise.
+	(SQL_QUERY_TIMEOUT): likewise.
+	(SQL_QUERY_TIMEOUT_DEFAULT): likewise.
+	(SQL_QUICK): likewise.
+	(SQL_QUIET_MODE): likewise.
+	(SQL_QUOTED_IDENTIFIER_CASE): likewise.
+	(SQL_RD_DEFAULT): likewise.
+	(SQL_RD_OFF): likewise.
+	(SQL_RD_ON): likewise.
+	(SQL_RETRIEVE_DATA): likewise.
+	(SQL_ROW_NUMBER): likewise.
+	(SQL_ROW_UPDATES): likewise.
+	(SQL_ROWSET_SIZE): likewise.
+	(SQL_ROWSET_SIZE_DEFAULT): likewise.
+	(SQL_ROWVER): likewise.
+	(SQL_SC_NON_UNIQUE): likewise.
+	(SQL_SC_TRY_UNIQUE): likewise.
+	(SQL_SC_UNIQUE): likewise.
+	(SQL_SCCO_OPT_TIMESTAMP): likewise.
+	(SQL_SCROLL_DYNAMIC): likewise.
+	(SQL_SCROLL_FORWARD_ONLY): likewise.
+	(SQL_SCROLL_KEYSET_DRIVEN): likewise.
+	(SQL_SCROLL_OPTIONS): likewise.
+	(SQL_SCROLL_STATIC): likewise.
+	(SQL_SEARCHABLE): likewise.
+	(SQL_SIGNED_OFFSET): likewise.
+	(SQL_SIMULATE_CURSOR): likewise.
+	(SQL_SO_DYNAMIC): likewise.
+	(SQL_SO_FORWARD_ONLY): likewise.
+	(SQL_SO_KEYSET_DRIVEN): likewise.
+	(SQL_SO_MIXED): likewise.
+	(SQL_SO_STATIC): likewise.
+	(SQL_SPEC_MAJOR): likewise.
+	(SQL_SPEC_MINOR): likewise.
+	(SQL_SPEC_STRING): likewise.
+	(SQL_SQ_COMPARISON): likewise.
+	(SQL_SQ_CORRELATED_SUBQUERIES): likewise.
+	(SQL_SQ_EXISTS): likewise.
+	(SQL_SQ_IN): likewise.
+	(SQL_SQ_QUANTIFIED): likewise.
+	(SQL_SQLSTATE_SIZE): likewise.
+	(SQL_SS_addITIONS): likewise.
+	(SQL_SS_DELETIONS): likewise.
+	(SQL_SS_UPDATES): likewise.
+	(SQL_STATIC_SENSITIVITY): likewise.
+	(SQL_STMT_OPT_MAX): likewise.
+	(SQL_STMT_OPT_MIN): likewise.
+	(SQL_STRING_FUNCTIONS): likewise.
+	(SQL_SUBQUERIES): likewise.
+	(SQL_SYSTEM_FUNCTIONS): likewise.
+	(SQL_TABLE_STAT): likewise.
+	(SQL_TABLE_TERM): likewise.
+	(SQL_TIME): likewise.
+	(SQL_TIMEDATE_add_INTERVALS): likewise.
+	(SQL_TIMEDATE_DIFF_INTERVALS): likewise.
+	(SQL_TIMEDATE_FUNCTIONS): likewise.
+	(SQL_TIMESTAMP): likewise.
+	(SQL_TINYINT): likewise.
+	(SQL_TRANSLATE_DLL): likewise.
+	(SQL_TRANSLATE_OPTION): likewise.
+	(SQL_TXN_ISOLATION): likewise.
+	(SQL_TXN_VERSIONING): likewise.
+	(SQL_TYPE_DRIVER_END): likewise.
+	(SQL_TYPE_DRIVER_START): likewise.
+	(SQL_TYPE_MAX): likewise.
+	(SQL_TYPE_MIN): likewise.
+	(SQL_TYPE_NULL): likewise.
+	(SQL_U_UNION): likewise.
+	(SQL_U_UNION_ALL): likewise.
+	(SQL_UB_DEFAULT): likewise.
+	(SQL_UB_OFF): likewise.
+	(SQL_UB_ON): likewise.
+	(SQL_UNICODE): likewise.
+	(SQL_UNICODE_CHAR): likewise.
+	(SQL_UNICODE_LONGVARCHAR): likewise.
+	(SQL_UNICODE_VARCHAR): likewise.
+	(SQL_UNION): likewise.
+	(SQL_UNSEARCHABLE): likewise.
+	(SQL_UNSIGNED_OFFSET): likewise.
+	(SQL_USE_BOOKMARKS): likewise.
+	(SQL_VARBINARY): likewise.
+	(SQL_TRUE): add define for ODBC3.x.
+	(SQL_FALSE): likewise.
+	(SQL_AM_CONNECTION): likewise.
+	(SQL_AM_NONE): likewise.
+	(SQL_AM_STATEMENT): likewise.
+	(SQL_API_SQLALLOCHANDLE): likewise.
+	(SQL_API_SQLBINDPARAM): likewise.
+	(SQL_API_SQLCLOSECURSOR): likewise.
+	(SQL_API_SQLCOLATTRIBUTE): likewise.
+	(SQL_API_SQLCOPYDESC): likewise.
+	(SQL_API_SQLENDTRAN): likewise.
+	(SQL_API_SQLFETCHSCROLL): likewise.
+	(SQL_API_SQLFREEHANDLE): likewise.
+	(SQL_API_SQLGETCONNECTATTR): likewise.
+	(SQL_API_SQLGETDESCFIELD): likewise.
+	(SQL_API_SQLGETDESCREC): likewise.
+	(SQL_API_SQLGETDIAGFIELD): likewise.
+	(SQL_API_SQLGETDIAGREC): likewise.
+	(SQL_API_SQLGETENVATTR): likewise.
+	(SQL_API_SQLGETSTMTATTR): likewise.
+	(SQL_API_SQLSETCONNECTATTR): likewise.
+	(SQL_API_SQLSETDESCFIELD): likewise.
+	(SQL_API_SQLSETDESCREC): likewise.
+	(SQL_API_SQLSETENVATTR): likewise.
+	(SQL_API_SQLSETSTMTATTR): likewise.
+	(SQL_ARD_TYPE): likewise.
+	(SQL_AT_add_CONSTRAINT): likewise.
+	(SQL_ATTR_APP_PARAM_DESC): likewise.
+	(SQL_ATTR_APP_ROW_DESC): likewise.
+	(SQL_ATTR_AUTO_IPD): likewise.
+	(SQL_ATTR_CURSOR_SCROLLABLE): likewise.
+	(SQL_ATTR_CURSOR_SENSITIVITY): likewise.
+	(SQL_ATTR_IMP_PARAM_DESC): likewise.
+	(SQL_ATTR_IMP_ROW_DESC): likewise.
+	(SQL_ATTR_METADATA_ID): likewise.
+	(SQL_ATTR_OUTPUT_NTS): likewise.
+	(SQL_CATALOG_NAME): likewise.
+	(SQL_CODE_DATE): likewise.
+	(SQL_CODE_TIME): likewise.
+	(SQL_CODE_TIMESTAMP): likewise.
+	(SQL_COLLATION_SEQ): likewise.
+	(SQL_CURSOR_SENSITIVITY): likewise.
+	(SQL_DATE_LEN): likewise.
+	(SQL_DATETIME): likewise.
+	(SQL_DEFAULT): likewise.
+	(SQL_DESC_ALLOC_AUTO): likewise.
+	(SQL_DESC_ALLOC_TYPE): likewise.
+	(SQL_DESC_ALLOC_USER): likewise.
+	(SQL_DESC_COUNT): likewise.
+	(SQL_DESC_DATA_PTR): likewise.
+	(SQL_DESC_DATETIME_INTERVAL_CODE): likewise.
+	(SQL_DESC_INDICATOR_PTR): likewise.
+	(SQL_DESC_LENGTH): likewise.
+	(SQL_DESC_NAME): likewise.
+	(SQL_DESC_NULLABLE): likewise.
+	(SQL_DESC_OCTET_LENGTH): likewise.
+	(SQL_DESC_OCTET_LENGTH_PTR): likewise.
+	(SQL_DESC_PRECISION): likewise.
+	(SQL_DESC_SCALE): likewise.
+	(SQL_DESC_TYPE): likewise.
+	(SQL_DESC_UNNAMED): likewise.
+	(SQL_DESCRIBE_PARAMETER): likewise.
+	(SQL_DIAG_ALTER_DOMAIN): likewise.
+	(SQL_DIAG_ALTER_TABLE): likewise.
+	(SQL_DIAG_CALL): likewise.
+	(SQL_DIAG_CLASS_ORIGIN): likewise.
+	(SQL_DIAG_CONNECTION_NAME): likewise.
+	(SQL_DIAG_CREATE_ASSERTION): likewise.
+	(SQL_DIAG_CREATE_CHARACTER_SET): likewise.
+	(SQL_DIAG_CREATE_COLLATION): likewise.
+	(SQL_DIAG_CREATE_DOMAIN): likewise.
+	(SQL_DIAG_CREATE_INDEX): likewise.
+	(SQL_DIAG_CREATE_SCHEMA): likewise.
+	(SQL_DIAG_CREATE_TABLE): likewise.
+	(SQL_DIAG_CREATE_TRANSLATION): likewise.
+	(SQL_DIAG_CREATE_VIEW): likewise.
+	(SQL_DIAG_DELETE_WHERE): likewise.
+	(SQL_DIAG_DROP_ASSERTION): likewise.
+	(SQL_DIAG_DROP_CHARACTER_SET): likewise.
+	(SQL_DIAG_DROP_COLLATION): likewise.
+	(SQL_DIAG_DROP_DOMAIN): likewise.
+	(SQL_DIAG_DROP_INDEX): likewise.
+	(SQL_DIAG_DROP_SCHEMA): likewise.
+	(SQL_DIAG_DROP_TABLE): likewise.
+	(SQL_DIAG_DROP_TRANSLATION): likewise.
+	(SQL_DIAG_DROP_VIEW): likewise.
+	(SQL_DIAG_DYNAMIC_DELETE_CURSOR): likewise.
+	(SQL_DIAG_DYNAMIC_FUNCTION): likewise.
+	(SQL_DIAG_DYNAMIC_FUNCTION_CODE): likewise.
+	(SQL_DIAG_DYNAMIC_UPDATE_CURSOR): likewise.
+	(SQL_DIAG_GRANT): likewise.
+	(SQL_DIAG_INSERT): likewise.
+	(SQL_DIAG_MESSAGE_TEXT): likewise.
+	(SQL_DIAG_NATIVE): likewise.
+	(SQL_DIAG_NUMBER): likewise.
+	(SQL_DIAG_RETURNCODE): likewise.
+	(SQL_DIAG_REVOKE): likewise.
+	(SQL_DIAG_ROW_COUNT): likewise.
+	(SQL_DIAG_SELECT_CURSOR): likewise.
+	(SQL_DIAG_SERVER_NAME): likewise.
+	(SQL_DIAG_SQLSTATE): likewise.
+	(SQL_DIAG_SUBCLASS_ORIGIN): likewise.
+	(SQL_DIAG_UNKNOWN_STATEMENT): likewise.
+	(SQL_DIAG_UPDATE_WHERE): likewise.
+	(SQL_FALSE): likewise.
+	(SQL_FETCH_ABSOLUTE): likewise.
+	(SQL_FETCH_LAST): likewise.
+	(SQL_FETCH_PRIOR): likewise.
+	(SQL_FETCH_RELATIVE): likewise.
+	(SQL_HANDLE_DBC): likewise.
+	(SQL_HANDLE_DESC): likewise.
+	(SQL_HANDLE_ENV): likewise.
+	(SQL_HANDLE_STMT): likewise.
+	(SQL_INSENSITIVE): likewise.
+	(SQL_INTEGRITY): likewise.
+	(SQL_MAX_CATALOG_NAME_LEN): likewise.
+	(SQL_MAX_CONCURRENT_ACTIVITIES): likewise.
+	(SQL_MAX_DRIVER_CONNECTIONS): likewise.
+	(SQL_MAX_IDENTIFIER_LEN): likewise.
+	(SQL_MAX_SCHEMA_NAME_LEN): likewise.
+	(SQL_MAXIMUM_CATALOG_NAME_LENGTH): likewise.
+	(SQL_MAXIMUM_COLUMN_NAME_LENGTH): likewise.
+	(SQL_MAXIMUM_COLUMNS_IN_GROUP_BY): likewise.
+	(SQL_MAXIMUM_COLUMNS_IN_INDEX): likewise.
+	(SQL_MAXIMUM_COLUMNS_IN_ORDER_BY): likewise.
+	(SQL_MAXIMUM_COLUMNS_IN_SELECT): likewise.
+	(SQL_MAXIMUM_CONCURRENT_ACTIVITIES): likewise.
+	(SQL_MAXIMUM_CURSOR_NAME_LENGTH): likewise.
+	(SQL_MAXIMUM_DRIVER_CONNECTIONS): likewise.
+	(SQL_MAXIMUM_IDENTIFIER_LENGTH): likewise.
+	(SQL_MAXIMUM_INDEX_SIZE): likewise.
+	(SQL_MAXIMUM_ROW_SIZE): likewise.
+	(SQL_MAXIMUM_SCHEMA_NAME_LENGTH): likewise.
+	(SQL_MAXIMUM_STATEMENT_LENGTH): likewise.
+	(SQL_MAXIMUM_TABLES_IN_SELECT): likewise.
+	(SQL_MAXIMUM_USER_NAME_LENGTH): likewise.
+	(SQL_NAMED): likewise.
+	(SQL_NONSCROLLABLE): likewise.
+	(SQL_NTSL): likewise.
+	(SQL_NULL_HANDLE): likewise.
+	(SQL_NULL_HDESC): likewise.
+	(SQL_OUTER_JOIN_CAPABILITIES): likewise.
+	(SQL_PRED_BASIC): likewise.
+	(SQL_PRED_CHAR): likewise.
+	(SQL_PRED_NONE): likewise.
+	(SQL_ROW_IDENTIFIER): likewise.
+	(SQL_SCROLLABLE): likewise.
+	(SQL_SENSITIVE): likewise.
+	(SQL_SUCCEEDED(rc)): likewise.
+	(SQL_TIME_LEN): likewise.
+	(SQL_TIMESTAMP_LEN): likewise.
+	(SQL_TRANSACTION_CAPABLE): likewise.
+	(SQL_TRANSACTION_ISOLATION_OPTION): likewise.
+	(SQL_TRANSACTION_READ_COMMITTED): likewise.
+	(SQL_TRANSACTION_READ_UNCOMMITTED): likewise.
+	(SQL_TRANSACTION_REPEATABLE_READ): likewise.
+	(SQL_TRANSACTION_SERIALIZABLE): likewise.
+	(SQL_TYPE_DATE): likewise.
+	(SQL_TYPE_TIME): likewise.
+	(SQL_TYPE_TIMESTAMP): likewise.
+	(SQL_UNKNOWN_TYPE): likewise.
+	(SQL_UNNAMED): likewise.
+	(SQL_UNSPECIFIED): likewise.
+	(SQL_XOPEN_CLI_YEAR): likewise.
+	(SQLAllocConnect): add comment marking as deperecated.
+	(SQLAllocEnv): likewise.
+	(SQLAllocStmt): likewise.
+	(SQLFreeConnect): likewise.
+	(SQLFreeEnv): likewise.
+	(SQLGetConnectOption): likewise.
+	(SQLGetStmtOption): likewise.
+
+	* include/sqlext.h (#include <sqlucode.h>): add directive.
+	(SQLSetScrollOptions): non-core function, move prototype from sql.h.
+	(SQLColAttributes): likewise.
+	(SQLBulkOperations): add function prototype.
+	(SQLAllocHandleStd): likewise
+	(TraceReturn): add Trace API prototype.
+	(TraceVersion): likewise.
+	(ODBCGetTryWaitValue):likewise.
+	(ODBCSetTryWaitValue): likewise.
+	(SQL_LOCK_RECORD): correct function macro.
+	(SQL_REFRESH_RECORD): likewise.
+	(SQLINTENGER and SQLUINTEGER): replace with SQLLEN and SQLULEN for 
+	_WIN64 compatability.
+	move defines for non-core functions from sql.h to sqlext.h (refer 
+	changes for sql.h)
+	(SQL_ACTIVE_ENVIRONMENTS): new ODBC3.x define
+	(SQL_AD_ADD_CONSTRAINT_DEFERRABLE): likewise.
+	(SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED): likewise.
+	(SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
+	(SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE): likewise.
+	(SQL_AD_ADD_DOMAIN_CONSTRAINT): likewise.
+	(SQL_AD_ADD_DOMAIN_DEFAULT): likewise.
+	(SQL_AD_CONSTRAINT_NAME_DEFINITION): likewise.
+	(SQL_AD_DROP_DOMAIN_CONSTRAINT): likewise.
+	(SQL_AD_DROP_DOMAIN_DEFAULT): likewise.
+	(SQL_AF_ALL): likewise.
+	(SQL_AF_AVG): likewise.
+	(SQL_AF_COUNT): likewise.
+	(SQL_AF_DISTINCT): likewise.
+	(SQL_AF_MAX): likewise.
+	(SQL_AF_MIN): likewise.
+	(SQL_AF_SUM): likewise.
+	(SQL_AGGREGATE_FUNCTIONS): likewise.
+	(SQL_ALL_CATALOGS): likewise.
+	(SQL_ALL_SCHEMAS): likewise.
+	(SQL_ALL_TABLE_TYPES): likewise.
+	(SQL_ALTER_DOMAIN): likewise.
+	(SQL_AM_CONNECTION): likewise.
+	(SQL_AM_NONE): likewise.
+	(SQL_AM_STATEMENT): likewise.
+	(SQL_API_ODBC3_ALL_FUNCTIONS): likewise.
+	(SQL_API_ODBC3_ALL_FUNCTIONS_SIZE): likewise.
+	(SQL_API_SQLALLOCHANDLESTD): likewise.
+	(SQL_API_SQLBULKOPERATIONS): likewise.
+	(SQL_ASYNC_MODE): likewise.
+	(SQL_AT_ADD_COLUMN_COLLATION): likewise.
+	(SQL_AT_ADD_COLUMN_DEFAULT): likewise.
+	(SQL_AT_ADD_COLUMN_SINGLE): likewise.
+	(SQL_AT_ADD_TABLE_CONSTRAINT): likewise.
+	(SQL_AT_CONSTRAINT_DEFERRABLE): likewise.
+	(SQL_AT_CONSTRAINT_INITIALLY_DEFERRED): likewise.
+	(SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
+	(SQL_AT_CONSTRAINT_NAME_DEFINITION): likewise.
+	(SQL_AT_CONSTRAINT_NON_DEFERRABLE): likewise.
+	(SQL_AT_DROP_COLUMN_CASCADE): likewise.
+	(SQL_AT_DROP_COLUMN_DEFAULT): likewise.
+	(SQL_AT_DROP_COLUMN_RESTRICT): likewise.
+	(SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE): likewise.
+	(SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT): likewise.
+	(SQL_AT_SET_COLUMN_DEFAULT): likewise.
+	(SQL_ATTR_ACCESS_MODE): likewise.
+	(SQL_ATTR_ASYNC_ENABLE): likewise.
+	(SQL_ATTR_AUTOCOMMIT): likewise.
+	(SQL_ATTR_CONCURRENCY): likewise.
+	(SQL_ATTR_CONNECTION_POOLING): likewise.
+	(SQL_ATTR_CONNECTION_TIMEOUT): likewise.
+	(SQL_ATTR_CP_MATCH): likewise.
+	(SQL_ATTR_CURRENT_CATALOG): likewise.
+	(SQL_ATTR_CURSOR_TYPE): likewise.
+	(SQL_ATTR_DISCONNECT_BEHAVIOR): likewise.
+	(SQL_ATTR_ENABLE_AUTO_IPD): likewise.
+	(SQL_ATTR_ENLIST_IN_DTC): likewise.
+	(SQL_ATTR_ENLIST_IN_XA): likewise.
+	(SQL_ATTR_FETCH_BOOKMARK_PTR): likewise.
+	(SQL_ATTR_KEYSET_SIZE): likewise.
+	(SQL_ATTR_LOGIN_TIMEOUT): likewise.
+	(SQL_ATTR_MAX_LENGTH): likewise.
+	(SQL_ATTR_MAX_ROWS): likewise.
+	(SQL_ATTR_NOSCAN): likewise.
+	(SQL_ATTR_ODBC_CURSORS): likewise.
+	(SQL_ATTR_ODBC_VERSION): likewise.
+	(SQL_ATTR_PACKET_SIZE): likewise.
+	(SQL_ATTR_PARAM_BIND_OFFSET_PTR): likewise.
+	(SQL_ATTR_PARAM_BIND_TYPE): likewise.
+	(SQL_ATTR_PARAM_OPERATION_PTR): likewise.
+	(SQL_ATTR_PARAM_STATUS_PTR): likewise.
+	(SQL_ATTR_PARAMS_PROCESSED_PTR): likewise.
+	(SQL_ATTR_PARAMSET_SIZE): likewise.
+	(SQL_ATTR_QUERY_TIMEOUT): likewise.
+	(SQL_ATTR_QUIET_MODE): likewise.
+	(SQL_ATTR_RETRIEVE_DATA): likewise.
+	(SQL_ATTR_ROW_ARRAY_SIZE): likewise.
+	(SQL_ATTR_ROW_BIND_OFFSET_PTR): likewise.
+	(SQL_ATTR_ROW_BIND_TYPE): likewise.
+	(SQL_ATTR_ROW_NUMBER): likewise.
+	(SQL_ATTR_ROW_OPERATION_PTR): likewise.
+	(SQL_ATTR_ROW_STATUS_PTR): likewise.
+	(SQL_ATTR_ROWS_FETCHED_PTR): likewise.
+	(SQL_ATTR_SIMULATE_CURSOR): likewise.
+	(SQL_ATTR_TRACE): likewise.
+	(SQL_ATTR_TRACEFILE): likewise.
+	(SQL_ATTR_TRANSLATE_LIB): likewise.
+	(SQL_ATTR_TRANSLATE_OPTION): likewise.
+	(SQL_ATTR_TXN_ISOLATION): likewise.
+	(SQL_ATTR_USE_BOOKMARKS): likewise.
+	(SQL_BATCH_ROW_COUNT): likewise.
+	(SQL_BATCH_SUPPORT): likewise.
+	(SQL_BRC_EXPLICIT): likewise.
+	(SQL_BRC_PROCEDURES): likewise.
+	(SQL_BRC_ROLLED_UP): likewise.
+	(SQL_BS_ROW_COUNT_EXPLICIT): likewise.
+	(SQL_BS_ROW_COUNT_PROC): likewise.
+	(SQL_BS_SELECT_EXPLICIT): likewise.
+	(SQL_BS_SELECT_PROC): likewise.
+	(SQL_C_INTERVAL_DAY): likewise.
+	(SQL_C_INTERVAL_DAY_TO_HOUR): likewise.
+	(SQL_C_INTERVAL_DAY_TO_MINUTE): likewise.
+	(SQL_C_INTERVAL_DAY_TO_SECOND): likewise.
+	(SQL_C_INTERVAL_HOUR): likewise.
+	(SQL_C_INTERVAL_HOUR_TO_MINUTE): likewise.
+	(SQL_C_INTERVAL_HOUR_TO_SECOND): likewise.
+	(SQL_C_INTERVAL_MINUTE): likewise.
+	(SQL_C_INTERVAL_MINUTE_TO_SECOND): likewise.
+	(SQL_C_INTERVAL_MONTH): likewise.
+	(SQL_C_INTERVAL_SECOND): likewise.
+	(SQL_C_INTERVAL_YEAR): likewise.
+	(SQL_C_INTERVAL_YEAR_TO_MONTH): likewise.
+	(SQL_C_NUMERIC): likewise.
+	(SQL_C_SBIGINT): likewise.
+	(SQL_C_TYPE_DATE): likewise.
+	(SQL_C_TYPE_TIME): likewise.
+	(SQL_C_TYPE_TIMESTAMP): likewise.
+	(SQL_C_UBIGINT): likewise.
+	(SQL_C_VARBOOKMARK): likewise.
+	(SQL_CA_CONSTRAINT_DEFERRABLE): likewise.
+	(SQL_CA_CONSTRAINT_INITIALLY_DEFERRED): likewise.
+	(SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
+	(SQL_CA_CONSTRAINT_NON_DEFERRABLE): likewise.
+	(SQL_CA_CREATE_ASSERTION): likewise.
+	(SQL_CA1_ABSOLUTE): likewise.
+	(SQL_CA1_BOOKMARK): likewise.
+	(SQL_CA1_BULK_ADD): likewise.
+	(SQL_CA1_BULK_DELETE_BY_BOOKMARK): likewise.
+	(SQL_CA1_BULK_FETCH_BY_BOOKMARK): likewise.
+	(SQL_CA1_BULK_UPDATE_BY_BOOKMARK): likewise.
+	(SQL_CA1_LOCK_EXCLUSIVE): likewise.
+	(SQL_CA1_LOCK_NO_CHANGE): likewise.
+	(SQL_CA1_LOCK_UNLOCK): likewise.
+	(SQL_CA1_NEXT): likewise.
+	(SQL_CA1_POS_DELETE): likewise.
+	(SQL_CA1_POS_POSITION): likewise.
+	(SQL_CA1_POS_REFRESH): likewise.
+	(SQL_CA1_POS_UPDATE): likewise.
+	(SQL_CA1_POSITIONED_DELETE): likewise.
+	(SQL_CA1_POSITIONED_UPDATE): likewise.
+	(SQL_CA1_RELATIVE): likewise.
+	(SQL_CA1_SELECT_FOR_UPDATE): likewise.
+	(SQL_CA2_CRC_APPROXIMATE): likewise.
+	(SQL_CA2_CRC_EXACT): likewise.
+	(SQL_CA2_LOCK_CONCURRENCY): likewise.
+	(SQL_CA2_MAX_ROWS_AFFECTS_ALL): likewise.
+	(SQL_CA2_MAX_ROWS_CATALOG): likewise.
+	(SQL_CA2_MAX_ROWS_DELETE): likewise.
+	(SQL_CA2_MAX_ROWS_INSERT): likewise.
+	(SQL_CA2_MAX_ROWS_SELECT): likewise.
+	(SQL_CA2_MAX_ROWS_UPDATE): likewise.
+	(SQL_CA2_OPT_ROWVER_CONCURRENCY): likewise.
+	(SQL_CA2_OPT_VALUES_CONCURRENCY): likewise.
+	(SQL_CA2_READ_ONLY_CONCURRENCY): likewise.
+	(SQL_CA2_SENSITIVITY_ADDITIONS): likewise.
+	(SQL_CA2_SENSITIVITY_DELETIONS): likewise.
+	(SQL_CA2_SENSITIVITY_UPDATES): likewise.
+	(SQL_CA2_SIMULATE_NON_UNIQUE): likewise.
+	(SQL_CA2_SIMULATE_TRY_UNIQUE): likewise.
+	(SQL_CA2_SIMULATE_UNIQUE): likewise.
+	(SQL_CATALOG_LOCATION): likewise.
+	(SQL_CATALOG_NAME_SEPARATOR): likewise.
+	(SQL_CATALOG_TERM): likewise.
+	(SQL_CATALOG_USAGE): likewise.
+	(SQL_CCOL_CREATE_COLLATION): likewise.
+	(SQL_CCS_COLLATE_CLAUSE): likewise.
+	(SQL_CCS_CREATE_CHARACTER_SET): likewise.
+	(SQL_CCS_LIMITED_COLLATION): likewise.
+	(SQL_CDO_COLLATION): likewise.
+	(SQL_CDO_CONSTRAINT): likewise.
+	(SQL_CDO_CONSTRAINT_DEFERRABLE): likewise.
+	(SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED): likewise.
+	(SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
+	(SQL_CDO_CONSTRAINT_NAME_DEFINITION): likewise.
+	(SQL_CDO_CONSTRAINT_NON_DEFERRABLE): likewise.
+	(SQL_CDO_CREATE_DOMAIN): likewise.
+	(SQL_CDO_DEFAULT): likewise.
+	(SQL_CL_END): likewise.
+	(SQL_CL_START): likewise.
+	(SQL_COL_PRED_BASIC): likewise.
+	(SQL_COL_PRED_CHAR): likewise.
+	(SQL_COLUMN_DRIVER_START): likewise.
+	(SQL_COLUMN_IGNORE): likewise.
+	(SQL_COLUMN_NUMBER_UNKNOWN): likewise.
+	(SQL_CONVERT_GUID): likewise.
+	(SQL_CONVERT_INTERVAL_DAY_TIME): likewise.
+	(SQL_CONVERT_INTERVAL_YEAR_MONTH): likewise.
+	(SQL_CONVERT_WCHAR): likewise.
+	(SQL_CONVERT_WLONGVARCHAR): likewise.
+	(SQL_CONVERT_WVARCHAR): likewise.
+	(SQL_CP_DEFAULT): likewise.
+	(SQL_CP_MATCH_DEFAULT): likewise.
+	(SQL_CP_OFF): likewise.
+	(SQL_CP_ONE_PER_DRIVER): likewise.
+	(SQL_CP_ONE_PER_HENV): likewise.
+	(SQL_CP_RELAXED_MATCH): likewise.
+	(SQL_CP_STRICT_MATCH): likewise.
+	(SQL_CREATE_ASSERTION): likewise.
+	(SQL_CREATE_CHARACTER_SET): likewise.
+	(SQL_CREATE_COLLATION): likewise.
+	(SQL_CREATE_DOMAIN): likewise.
+	(SQL_CREATE_SCHEMA): likewise.
+	(SQL_CREATE_TABLE): likewise.
+	(SQL_CREATE_TRANSLATION): likewise.
+	(SQL_CREATE_VIEW): likewise.
+	(SQL_CS_AUTHORIZATION): likewise.
+	(SQL_CS_CREATE_SCHEMA): likewise.
+	(SQL_CS_DEFAULT_CHARACTER_SET): likewise.
+	(SQL_CT_COLUMN_COLLATION): likewise.
+	(SQL_CT_COLUMN_CONSTRAINT): likewise.
+	(SQL_CT_COLUMN_DEFAULT): likewise.
+	(SQL_CT_COMMIT_DELETE): likewise.
+	(SQL_CT_COMMIT_PRESERVE): likewise.
+	(SQL_CT_CONSTRAINT_DEFERRABLE): likewise.
+	(SQL_CT_CONSTRAINT_INITIALLY_DEFERRED): likewise.
+	(SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
+	(SQL_CT_CONSTRAINT_NAME_DEFINITION): likewise.
+	(SQL_CT_CONSTRAINT_NON_DEFERRABLE): likewise.
+	(SQL_CT_CREATE_TABLE): likewise.
+	(SQL_CT_GLOBAL_TEMPORARY): likewise.
+	(SQL_CT_LOCAL_TEMPORARY): likewise.
+	(SQL_CT_TABLE_CONSTRAINT): likewise.
+	(SQL_CTR_CREATE_TRANSLATION): likewise.
+	(SQL_CU_DML_STATEMENTS): likewise.
+	(SQL_CU_INDEX_DEFINITION): likewise.
+	(SQL_CU_PRIVILEGE_DEFINITION): likewise.
+	(SQL_CU_PROCEDURE_INVOCATION): likewise.
+	(SQL_CU_TABLE_DEFINITION): likewise.
+	(SQL_CVT_GUID): likewise.
+	(SQL_CVT_INTERVAL_DAY_TIME): likewise.
+	(SQL_CVT_INTERVAL_YEAR_MONTH): likewise.
+	(SQL_CVT_WCHAR): likewise.
+	(SQL_CVT_WLONGVARCHAR): likewise.
+	(SQL_CVT_WVARCHAR): likewise.
+	(SQL_DA_DROP_ASSERTION): likewise.
+	(SQL_DATETIME_LITERALS): likewise.
+	(SQL_DB_DEFAULT): likewise.
+	(SQL_DB_DISCONNECT): likewise.
+	(SQL_DB_RETURN_TO_POOL): likewise.
+	(SQL_DC_DROP_COLLATION): likewise.
+	(SQL_DCS_DROP_CHARACTER_SET): likewise.
+	(SQL_DD_CASCADE): likewise.
+	(SQL_DD_DROP_DOMAIN): likewise.
+	(SQL_DD_RESTRICT): likewise.
+	(SQL_DDL_INDEX): likewise.
+	(SQL_DELETE_BY_BOOKMARK): likewise.
+	(SQL_DESC_ARRAY_SIZE): likewise.
+	(SQL_DESC_ARRAY_STATUS_PTR): likewise.
+	(SQL_DESC_AUTO_UNIQUE_VALUE): likewise.
+	(SQL_DESC_BASE_COLUMN_NAME): likewise.
+	(SQL_DESC_BASE_TABLE_NAME): likewise.
+	(SQL_DESC_BIND_OFFSET_PTR): likewise.
+	(SQL_DESC_BIND_TYPE): likewise.
+	(SQL_DESC_CASE_SENSITIVE): likewise.
+	(SQL_DESC_CATALOG_NAME): likewise.
+	(SQL_DESC_CONCISE_TYPE): likewise.
+	(SQL_DESC_DATETIME_INTERVAL_PRECISION): likewise.
+	(SQL_DESC_DISPLAY_SIZE): likewise.
+	(SQL_DESC_FIXED_PREC_SCALE): likewise.
+	(SQL_DESC_LABEL): likewise.
+	(SQL_DESC_LITERAL_PREFIX): likewise.
+	(SQL_DESC_LITERAL_SUFFIX): likewise.
+	(SQL_DESC_LOCAL_TYPE_NAME): likewise.
+	(SQL_DESC_MAXIMUM_SCALE): likewise.
+	(SQL_DESC_MINIMUM_SCALE): likewise.
+	(SQL_DESC_NUM_PREC_RADIX): likewise.
+	(SQL_DESC_PARAMETER_TYPE): likewise.
+	(SQL_DESC_ROWS_PROCESSED_PTR): likewise.
+	(SQL_DESC_SCHEMA_NAME): likewise.
+	(SQL_DESC_SEARCHABLE): likewise.
+	(SQL_DESC_TABLE_NAME): likewise.
+	(SQL_DESC_TYPE_NAME): likewise.
+	(SQL_DESC_UNSIGNED): likewise.
+	(SQL_DESC_UPDATABLE): likewise.
+	(SQL_DI_CREATE_INDEX): likewise.
+	(SQL_DI_DROP_INDEX): likewise.
+	(SQL_DIAG_COLUMN_NUMBER): likewise.
+	(SQL_DIAG_CURSOR_ROW_COUNT): likewise.
+	(SQL_DIAG_ROW_NUMBER): likewise.
+	(SQL_DL_SQL92_DATE): likewise.
+	(SQL_DL_SQL92_INTERVAL_DAY): likewise.
+	(SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR): likewise.
+	(SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE): likewise.
+	(SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND): likewise.
+	(SQL_DL_SQL92_INTERVAL_HOUR): likewise.
+	(SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE): likewise.
+	(SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND): likewise.
+	(SQL_DL_SQL92_INTERVAL_MINUTE): likewise.
+	(SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND): likewise.
+	(SQL_DL_SQL92_INTERVAL_MONTH): likewise.
+	(SQL_DL_SQL92_INTERVAL_SECOND): likewise.
+	(SQL_DL_SQL92_INTERVAL_YEAR): likewise.
+	(SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH): likewise.
+	(SQL_DL_SQL92_TIME): likewise.
+	(SQL_DL_SQL92_TIMESTAMP): likewise.
+	(SQL_DM_VER): likewise.
+	(SQL_DRIVER_HDESC): likewise.
+	(SQL_DROP_ASSERTION): likewise.
+	(SQL_DROP_CHARACTER_SET): likewise.
+	(SQL_DROP_COLLATION): likewise.
+	(SQL_DROP_DOMAIN): likewise.
+	(SQL_DROP_SCHEMA): likewise.
+	(SQL_DROP_TABLE): likewise.
+	(SQL_DROP_TRANSLATION): likewise.
+	(SQL_DROP_VIEW): likewise.
+	(SQL_DS_CASCADE): likewise.
+	(SQL_DS_DROP_SCHEMA): likewise.
+	(SQL_DS_RESTRICT): likewise.
+	(SQL_DT_CASCADE): likewise.
+	(SQL_DT_DROP_TABLE): likewise.
+	(SQL_DT_RESTRICT): likewise.
+	(SQL_DTC_DONE): likewise.
+	(SQL_DTR_DROP_TRANSLATION): likewise.
+	(SQL_DV_CASCADE): likewise.
+	(SQL_DV_DROP_VIEW): likewise.
+	(SQL_DV_RESTRICT): likewise.
+	(SQL_DYNAMIC_CURSOR_ATTRIBUTES1): likewise.
+	(SQL_DYNAMIC_CURSOR_ATTRIBUTES2): likewise.
+	(SQL_EXT_API_LAST): likewise.
+	(SQL_EXT_API_START): likewise.
+	(SQL_FETCH_BY_BOOKMARK): likewise.
+	(SQL_FETCH_FIRST_SYSTEM): likewise.
+	(SQL_FETCH_FIRST_USER): likewise.
+	(SQL_FN_CVT_CAST): likewise.
+	(SQL_FN_STR_BIT_LENGTH): likewise.
+	(SQL_FN_STR_CHAR_LENGTH): likewise.
+	(SQL_FN_STR_CHARACTER_LENGTH): likewise.
+	(SQL_FN_STR_OCTET_LENGTH): likewise.
+	(SQL_FN_STR_POSITION): likewise.
+	(SQL_FN_TD_CURRENT_DATE): likewise.
+	(SQL_FN_TD_CURRENT_TIME): likewise.
+	(SQL_FN_TD_CURRENT_TIMESTAMP): likewise.
+	(SQL_FN_TD_EXTRACT): likewise.
+	(SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1): likewise.
+	(SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2): likewise.
+	(SQL_FUNC_EXISTS(exists,api)): likewise.
+	(SQL_GB_COLLATE): likewise.
+	(SQL_HANDLE_SENV): likewise.
+	(SQL_IK_ALL): likewise.
+	(SQL_IK_ASC): likewise.
+	(SQL_IK_DESC): likewise.
+	(SQL_IK_NONE): likewise.
+	(SQL_INDEX_KEYWORDS): likewise.
+	(SQL_INFO_DRIVER_START): likewise.
+	(SQL_INFO_LAST): likewise.
+	(SQL_INFO_SCHEMA_VIEWS): likewise.
+	(SQL_INITIALLY_DEFERRED): likewise.
+	(SQL_INITIALLY_IMMEDIATE): likewise.
+	(SQL_INSERT_STATEMENT): likewise.
+	(SQL_INTERVAL): likewise.
+	(SQL_IS_INSERT_LITERALS): likewise.
+	(SQL_IS_INSERT_SEARCHED): likewise.
+	(SQL_IS_INTEGER): likewise.
+	(SQL_IS_POINTER): likewise.
+	(SQL_IS_SELECT_INTO): likewise.
+	(SQL_IS_SMALLINT): likewise.
+	(SQL_IS_UINTEGER): likewise.
+	(SQL_IS_USMALLINT): likewise.
+	(SQL_ISV_ASSERTIONS): likewise.
+	(SQL_ISV_CHARACTER_SETS): likewise.
+	(SQL_ISV_CHECK_CONSTRAINTS): likewise.
+	(SQL_ISV_COLLATIONS): likewise.
+	(SQL_ISV_COLUMN_DOMAIN_USAGE): likewise.
+	(SQL_ISV_COLUMN_PRIVILEGES): likewise.
+	(SQL_ISV_COLUMNS): likewise.
+	(SQL_ISV_CONSTRAINT_COLUMN_USAGE): likewise.
+	(SQL_ISV_CONSTRAINT_TABLE_USAGE): likewise.
+	(SQL_ISV_DOMAIN_CONSTRAINTS): likewise.
+	(SQL_ISV_DOMAINS): likewise.
+	(SQL_ISV_KEY_COLUMN_USAGE): likewise.
+	(SQL_ISV_REFERENTIAL_CONSTRAINTS): likewise.
+	(SQL_ISV_SCHEMATA): likewise.
+	(SQL_ISV_SQL_LANGUAGES): likewise.
+	(SQL_ISV_TABLE_CONSTRAINTS): likewise.
+	(SQL_ISV_TABLE_PRIVILEGES): likewise.
+	(SQL_ISV_TABLES): likewise.
+	(SQL_ISV_TRANSLATIONS): likewise.
+	(SQL_ISV_USAGE_PRIVILEGES): likewise.
+	(SQL_ISV_VIEW_COLUMN_USAGE): likewise.
+	(SQL_ISV_VIEW_TABLE_USAGE): likewise.
+	(SQL_ISV_VIEWS): likewise.
+	(SQL_KEYSET_CURSOR_ATTRIBUTES1): likewise.
+	(SQL_KEYSET_CURSOR_ATTRIBUTES2): likewise.
+	(SQL_MAX_ASYNC_CONCURRENT_STATEMENTS): likewise.
+	(SQL_NO_COLUMN_NUMBER): likewise.
+	(SQL_NO_ROW_NUMBER): likewise.
+	(SQL_NOT_DEFERRABLE): likewise.
+	(SQL_NUM_EXTENSIONS): likewise.
+	(SQL_NUM_FUNCTIONS): likewise.
+	(SQL_ODBC_INTERFACE_CONFORMANCE): likewise.
+	(SQL_OIC_CORE): likewise.
+	(SQL_OIC_LEVEL1): likewise.
+	(SQL_OIC_LEVEL2): likewise.
+	(SQL_OV_ODBC2): likewise.
+	(SQL_OV_ODBC3): likewise.
+	(SQL_PARAM_ARRAY_ROW_COUNTS): likewise.
+	(SQL_PARAM_ARRAY_SELECTS): likewise.
+	(SQL_PARAM_BIND_BY_COLUMN): likewise.
+	(SQL_PARAM_BIND_TYPE_DEFAULT): likewise.
+	(SQL_PARAM_DIAG_UNAVAILABLE): likewise.
+	(SQL_PARAM_ERROR): likewise.
+	(SQL_PARAM_IGNORE): likewise.
+	(SQL_PARAM_PROCEED): likewise.
+	(SQL_PARAM_SUCCESS): likewise.
+	(SQL_PARAM_SUCCESS_WITH_INFO): likewise.
+	(SQL_PARAM_UNUSED): likewise.
+	(SQL_PARC_BATCH): likewise.
+	(SQL_PARC_NO_BATCH): likewise.
+	(SQL_PAS_BATCH): likewise.
+	(SQL_PAS_NO_BATCH): likewise.
+	(SQL_PAS_NO_SELECT): likewise.
+	(SQL_ROW_IGNORE): likewise.
+	(SQL_ROW_NUMBER_UNKNOWN): likewise.
+	(SQL_ROW_PROCEED): likewise.
+	(SQL_ROW_SUCCESS_WITH_INFO): likewise.
+	(SQL_SC_FIPS127_2_TRANSITIONAL): likewise.
+	(SQL_SC_SQL92_ENTRY): likewise.
+	(SQL_SC_SQL92_FULL): likewise.
+	(SQL_SC_SQL92_INTERMEDIATE): likewise.
+	(SQL_SCC_ISO92_CLI): likewise.
+	(SQL_SCC_XOPEN_CLI_VERSION1): likewise.
+	(SQL_SCHEMA_TERM): likewise.
+	(SQL_SCHEMA_USAGE): likewise.
+	(SQL_SDF_CURRENT_DATE): likewise.
+	(SQL_SDF_CURRENT_TIME): likewise.
+	(SQL_SDF_CURRENT_TIMESTAMP): likewise.
+	(SQL_SFKD_CASCADE): likewise.
+	(SQL_SFKD_NO_ACTION): likewise.
+	(SQL_SFKD_SET_DEFAULT): likewise.
+	(SQL_SFKD_SET_NULL): likewise.
+	(SQL_SFKU_CASCADE): likewise.
+	(SQL_SFKU_NO_ACTION): likewise.
+	(SQL_SFKU_SET_DEFAULT): likewise.
+	(SQL_SFKU_SET_NULL): likewise.
+	(SQL_SG_DELETE_TABLE): likewise.
+	(SQL_SG_INSERT_COLUMN): likewise.
+	(SQL_SG_INSERT_TABLE): likewise.
+	(SQL_SG_REFERENCES_COLUMN): likewise.
+	(SQL_SG_REFERENCES_TABLE): likewise.
+	(SQL_SG_SELECT_TABLE): likewise.
+	(SQL_SG_UPDATE_COLUMN): likewise.
+	(SQL_SG_UPDATE_TABLE): likewise.
+	(SQL_SG_USAGE_ON_CHARACTER_SET): likewise.
+	(SQL_SG_USAGE_ON_COLLATION): likewise.
+	(SQL_SG_USAGE_ON_DOMAIN): likewise.
+	(SQL_SG_USAGE_ON_TRANSLATION): likewise.
+	(SQL_SG_WITH_GRANT_OPTION): likewise.
+	(SQL_SNVF_BIT_LENGTH): likewise.
+	(SQL_SNVF_CHAR_LENGTH): likewise.
+	(SQL_SNVF_CHARACTER_LENGTH): likewise.
+	(SQL_SNVF_EXTRACT): likewise.
+	(SQL_SNVF_OCTET_LENGTH): likewise.
+	(SQL_SNVF_POSITION): likewise.
+	(SQL_SP_BETWEEN): likewise.
+	(SQL_SP_COMPARISON): likewise.
+	(SQL_SP_EXISTS): likewise.
+	(SQL_SP_IN): likewise.
+	(SQL_SP_ISNOTNULL): likewise.
+	(SQL_SP_ISNULL): likewise.
+	(SQL_SP_LIKE): likewise.
+	(SQL_SP_MATCH_FULL): likewise.
+	(SQL_SP_MATCH_PARTIAL): likewise.
+	(SQL_SP_MATCH_UNIQUE_FULL): likewise.
+	(SQL_SP_MATCH_UNIQUE_PARTIAL): likewise.
+	(SQL_SP_OVERLAPS): likewise.
+	(SQL_SP_QUANTIFIED_COMPARISON): likewise.
+	(SQL_SP_UNIQUE): likewise.
+	(SQL_SQL_CONFORMANCE): likewise.
+	(SQL_SQL92_DATETIME_FUNCTIONS): likewise.
+	(SQL_SQL92_FOREIGN_KEY_DELETE_RULE): likewise.
+	(SQL_SQL92_FOREIGN_KEY_UPDATE_RULE): likewise.
+	(SQL_SQL92_GRANT): likewise.
+	(SQL_SQL92_NUMERIC_VALUE_FUNCTIONS): likewise.
+	(SQL_SQL92_PREDICATES): likewise.
+	(SQL_SQL92_RELATIONAL_JOIN_OPERATORS): likewise.
+	(SQL_SQL92_REVOKE): likewise.
+	(SQL_SQL92_ROW_VALUE_CONSTRUCTOR): likewise.
+	(SQL_SQL92_STRING_FUNCTIONS): likewise.
+	(SQL_SQL92_VALUE_EXPRESSIONS): likewise.
+	(SQL_SR_CASCADE): likewise.
+	(SQL_SR_DELETE_TABLE): likewise.
+	(SQL_SR_GRANT_OPTION_FOR): likewise.
+	(SQL_SR_INSERT_COLUMN): likewise.
+	(SQL_SR_INSERT_TABLE): likewise.
+	(SQL_SR_REFERENCES_COLUMN): likewise.
+	(SQL_SR_REFERENCES_TABLE): likewise.
+	(SQL_SR_RESTRICT): likewise.
+	(SQL_SR_SELECT_TABLE): likewise.
+	(SQL_SR_UPDATE_COLUMN): likewise.
+	(SQL_SR_UPDATE_TABLE): likewise.
+	(SQL_SR_USAGE_ON_CHARACTER_SET): likewise.
+	(SQL_SR_USAGE_ON_COLLATION): likewise.
+	(SQL_SR_USAGE_ON_DOMAIN): likewise.
+	(SQL_SR_USAGE_ON_TRANSLATION): likewise.
+	(SQL_SRJO_CORRESPONDING_CLAUSE): likewise.
+	(SQL_SRJO_CROSS_JOIN): likewise.
+	(SQL_SRJO_EXCEPT_JOIN): likewise.
+	(SQL_SRJO_FULL_OUTER_JOIN): likewise.
+	(SQL_SRJO_INNER_JOIN): likewise.
+	(SQL_SRJO_INTERSECT_JOIN): likewise.
+	(SQL_SRJO_LEFT_OUTER_JOIN): likewise.
+	(SQL_SRJO_NATURAL_JOIN): likewise.
+	(SQL_SRJO_RIGHT_OUTER_JOIN): likewise.
+	(SQL_SRJO_UNION_JOIN): likewise.
+	(SQL_SRVC_DEFAULT): likewise.
+	(SQL_SRVC_NULL): likewise.
+	(SQL_SRVC_ROW_SUBQUERY): likewise.
+	(SQL_SRVC_VALUE_EXPRESSION): likewise.
+	(SQL_SSF_CONVERT): likewise.
+	(SQL_SSF_LOWER): likewise.
+	(SQL_SSF_SUBSTRING): likewise.
+	(SQL_SSF_TRANSLATE): likewise.
+	(SQL_SSF_TRIM_BOTH): likewise.
+	(SQL_SSF_TRIM_LEADING): likewise.
+	(SQL_SSF_TRIM_TRAILING): likewise.
+	(SQL_SSF_UPPER): likewise.
+	(SQL_STANDARD_CLI_CONFORMANCE): likewise.
+	(SQL_STATIC_CURSOR_ATTRIBUTES1): likewise.
+	(SQL_STATIC_CURSOR_ATTRIBUTES2): likewise.
+	(SQL_SU_DML_STATEMENTS): likewise.
+	(SQL_SU_INDEX_DEFINITION): likewise.
+	(SQL_SU_PRIVILEGE_DEFINITION): likewise.
+	(SQL_SU_PROCEDURE_INVOCATION): likewise.
+	(SQL_SU_TABLE_DEFINITION): likewise.
+	(SQL_SVE_CASE): likewise.
+	(SQL_SVE_CAST): likewise.
+	(SQL_SVE_COALESCE): likewise.
+	(SQL_SVE_NULLIF): likewise.
+	(SQL_UB_FIXED): likewise.
+	(SQL_UB_VARIABLE): likewise.
+	(SQL_UNION_STATEMENT): likewise.
+	(SQL_UPDATE_BY_BOOKMARK): likewise.
+	(SQL_US_UNION): likewise.
+	(SQL_US_UNION_ALL): likewise.
+	(SQL_DESC_ROWVER): likewise.
+	(SQL_GUID): likewise.
+	(SQL_C_GUID): likewise.
+	(ODBC_STD): likewise.
+	(SQLAllocHandle): likewise.
+	(SQLAllocEnv(p)): likewise.
+	(SQL_YEAR): likewise.
+	(SQL_MONTH): likewise.
+	(SQL_DAY): likewise.
+	(SQL_HOUR): likewise.
+	(SQL_MINUTE): likewise.
+	(SQL_SECOND): likewise.
+	(SQL_YEAR_TO_MONTH): likewise.
+	(SQL_DAY_TO_HOUR): likewise.
+	(SQL_DAY_TO_MINUTE): likewise.
+	(SQL_DAY_TO_SECOND): likewise.
+	(SQL_HOUR_TO_MINUTE): likewise.
+	(SQL_HOUR_TO_SECOND): likewise.
+	(SQL_MINUTE_TO_SECOND): likewise.
+	(SQL_ATTR_ANSI_APP): likewise.
+	(SQL_AA_TRUE): likewise.
+	(SQL_AA_FALSE): likewise.
+
+	* include/sqltypes.h (#pragma pack(push,1), #pragma pack(pop)): remove.
+	(struct tagSQL_YEAR_MONTH): add for ODBC3.x.
+	(struct tagSQL_DAY_SECOND): likewise.
+	(struct	tagSQL_INTERVAL_STRUCT): likewise.
+	(struct tagSQL_NUMERIC_STRUCT): likewise.
+	(struct tagSQLGUID): add for 0DBC3.50.
+	(enum SQLINTERVAL): add for ODBC3.x.
+	(SQLWCHAR): add typedef.
+	(SQLTCHAR): add typedef, conditional on UNICODE.
+	(SQLLEN): add typedef for _WIN64, define for _WIN32.
+	(SQLULEN): likewise.
+	(SQLROWOFFSET): likewise.
+	(SQLROWCOUNT): likewise.
+	(SQLTRANSID): likewise.
+	(SQLSETPOSIROW): likewise.
+	(SQLHANDLE): add ODBC3.x typedef.	
+	(SQLHDESC): likewise.	
+	(SQLDATE): likewise.
+	(SQLDECIMAL): likewise.
+	(SQLDOUBLE): likewise.
+	(SQLFLOAT): likewise.
+	(SQLNUMERIC): likewise.
+	(SQLREAL): likewise.
+	(SQLTIME): likewise.
+	(SQLTIMESTAMP): likewise.
+	(SQLVARCHAR): likewise.
+	(SQLBIGINT): likewise.
+	(SQLUBIGINT): likewise.
+	(SQL_DATE_STRUCT): likewise.
+	(SQL_TIME_STRUCT): likewise.
+	(SQL_TIMESTAMP_STRUCT): likewise.
+	(ODBCINT64): add ODBC3.x define.
+
+	* lib/odbc32.def : regenerate.
+
 Fri Jan 26 15:59:31  2001  Earnie Boyd  <earnie@users.sourceforge.net
 
 	* Apply Danny Smith patch 102275
diff --git a/winsup/w32api/include/sql.h b/winsup/w32api/include/sql.h
index cbad41d3a..f5241c1a4 100644
--- a/winsup/w32api/include/sql.h
+++ b/winsup/w32api/include/sql.h
@@ -4,46 +4,27 @@
 extern "C" {
 #endif
 #ifndef ODBCVER
-#define ODBCVER 0x0250
+#define ODBCVER 0x0351
 #endif
-#include "sqltypes.h"
-/* FIXME! */
-#define SQL_SPEC_MAJOR (ODBCVER/0x100)
-#define SQL_SPEC_MINOR (ODBCVER&0xFF00)
-#define SQL_SPEC_STRING "02.50"
+#include <sqltypes.h>
 #define SQL_ACCESSIBLE_PROCEDURES 20
 #define SQL_ACCESSIBLE_TABLES 19
-#define SQL_ACCESS_MODE 101
-#define SQL_ACTIVE_CONNECTIONS 0
-#define SQL_ACTIVE_STATEMENTS 1
-#define SQL_ALL_EXCEPT_LIKE 2
 #define SQL_ALL_TYPES 0
 #define SQL_ALTER_TABLE 86
-#define SQL_API_ALL_FUNCTIONS 0
-#define SQL_API_LOADBYORDINAL 199
 #define SQL_API_SQLALLOCCONNECT 1
 #define SQL_API_SQLALLOCENV 2
 #define SQL_API_SQLALLOCSTMT 3
 #define SQL_API_SQLBINDCOL 4
-#define SQL_API_SQLBINDPARAMETER 72
-#define SQL_API_SQLBROWSECONNECT 55
 #define SQL_API_SQLCANCEL 5
-#define SQL_API_SQLCOLATTRIBUTES 6
-#define SQL_API_SQLCOLUMNPRIVILEGES 56
 #define SQL_API_SQLCOLUMNS 40
 #define SQL_API_SQLCONNECT 7
 #define SQL_API_SQLDATASOURCES 57
 #define SQL_API_SQLDESCRIBECOL 8
-#define SQL_API_SQLDESCRIBEPARAM 58
 #define SQL_API_SQLDISCONNECT 9
-#define SQL_API_SQLDRIVERCONNECT 41
-#define SQL_API_SQLDRIVERS 71
 #define SQL_API_SQLERROR 10
 #define SQL_API_SQLEXECDIRECT 11
 #define SQL_API_SQLEXECUTE 12
-#define SQL_API_SQLEXTENDEDFETCH 59
 #define SQL_API_SQLFETCH 13
-#define SQL_API_SQLFOREIGNKEYS 60
 #define SQL_API_SQLFREECONNECT 14
 #define SQL_API_SQLFREEENV 15
 #define SQL_API_SQLFREESTMT 16
@@ -54,288 +35,53 @@ extern "C" {
 #define SQL_API_SQLGETINFO 45
 #define SQL_API_SQLGETSTMTOPTION 46
 #define SQL_API_SQLGETTYPEINFO 47
-#define SQL_API_SQLMORERESULTS 61
-#define SQL_API_SQLNATIVESQL 62
-#define SQL_API_SQLNUMPARAMS 63
 #define SQL_API_SQLNUMRESULTCOLS 18
 #define SQL_API_SQLPARAMDATA 48
-#define SQL_API_SQLPARAMOPTIONS 64
 #define SQL_API_SQLPREPARE 19
-#define SQL_API_SQLPRIMARYKEYS 65
-#define SQL_API_SQLPROCEDURECOLUMNS 66
-#define SQL_API_SQLPROCEDURES 67
 #define SQL_API_SQLPUTDATA 49
 #define SQL_API_SQLROWCOUNT 20
 #define SQL_API_SQLSETCONNECTOPTION 50
 #define SQL_API_SQLSETCURSORNAME 21
 #define SQL_API_SQLSETPARAM 22
-#define SQL_API_SQLSETPOS 68
-#define SQL_API_SQLSETSCROLLOPTIONS 69
 #define SQL_API_SQLSETSTMTOPTION 51
 #define SQL_API_SQLSPECIALCOLUMNS 52
 #define SQL_API_SQLSTATISTICS 53
-#define SQL_API_SQLTABLEPRIVILEGES 70
 #define SQL_API_SQLTABLES 54
 #define SQL_API_SQLTRANSACT 23
-#define SQL_ASYNC_ENABLE_OFF 0
-#define SQL_ASYNC_ENABLE_ON 1
-#define SQL_ASYNC_ENABLE 4
-#define SQL_ASYNC_ENABLE_DEFAULT SQL_ASYNC_ENABLE_OFF
-#define SQL_ATTR_READONLY 0
-#define SQL_ATTR_READWRITE_UNKNOWN 2
-#define SQL_ATTR_WRITE 1
-#define SQL_AT_ADD_COLUMN 1
-#define SQL_AT_DROP_COLUMN 2
-#define SQL_AUTOCOMMIT 102
-#define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON
-#define SQL_AUTOCOMMIT_OFF 0UL
-#define SQL_AUTOCOMMIT_ON 1UL
-#define SQL_BEST_ROWID 1
-#define SQL_BIGINT (-5)
-#define SQL_BINARY (-2)
-#define SQL_BIND_BY_COLUMN 0UL
-#define SQL_BIND_TYPE 5
-#define SQL_BIND_TYPE_DEFAULT SQL_BIND_BY_COLUMN
-#define SQL_BIT (-7)
-#define SQL_BOOKMARK_PERSISTENCE 82
-#define SQL_BP_CLOSE 1
-#define SQL_BP_DELETE 2
-#define SQL_BP_DROP 4
-#define SQL_BP_OTHER_HSTMT 32
-#define SQL_BP_SCROLL 64
-#define SQL_BP_TRANSACTION 8
-#define SQL_BP_UPDATE 16
 #define SQL_CB_CLOSE 1
 #define SQL_CB_DELETE 0
-#define SQL_CB_NON_NULL 1
-#define SQL_CB_NULL 0
 #define SQL_CB_PRESERVE 2
-#define SQL_CC_CLOSE SQL_CB_CLOSE
-#define SQL_CC_DELETE SQL_CB_DELETE
-#define SQL_CC_PRESERVE SQL_CB_PRESERVE
 #define SQL_CHAR 1
 #define SQL_CLOSE 0
-#define SQL_CN_ANY 2
-#define SQL_CN_DIFFERENT 1
-#define SQL_CN_NONE 0
-#define SQL_COLUMN_ALIAS 87
-#define SQL_COLUMN_AUTO_INCREMENT 11
-#define SQL_COLUMN_CASE_SENSITIVE 12
-#define SQL_COLUMN_COUNT 0
-#define SQL_COLUMN_DISPLAY_SIZE 6
-#define SQL_COLUMN_DRIVER_START 1000
-#define SQL_COLUMN_LABEL 18
-#define SQL_COLUMN_LENGTH 3
-#define SQL_COLUMN_MONEY 9
-#define SQL_COLUMN_NAME 1
-#define SQL_COLUMN_NULLABLE 7
-#define SQL_COLUMN_OWNER_NAME 16
-#define SQL_COLUMN_PRECISION 4
-#define SQL_COLUMN_QUALIFIER_NAME 17
-#define SQL_COLUMN_SCALE 5
-#define SQL_COLUMN_SEARCHABLE 13
-#define SQL_COLUMN_TABLE_NAME 15
-#define SQL_COLUMN_TYPE 2
-#define SQL_COLUMN_TYPE_NAME 14
-#define SQL_COLUMN_UNSIGNED 8
-#define SQL_COLUMN_UPDATABLE 10
-#define SQL_COLATT_OPT_MAX SQL_COLUMN_LABEL
-#define SQL_COLATT_OPT_MIN SQL_COLUMN_COUNT
 #define SQL_COMMIT 0
-#define SQL_CONCAT_NULL_BEHAVIOR 22
-#define SQL_CONCURRENCY 7
-#define SQL_CONCUR_READ_ONLY 1
-#define SQL_CONCUR_ROWVER 3
-#define SQL_CONCUR_DEFAULT SQL_CONCUR_READ_ONLY
-#define SQL_CONCUR_LOCK 2
-#define SQL_CONCUR_TIMESTAMP SQL_CONCUR_ROWVER
-#define SQL_CONCUR_VALUES 4
-#define SQL_CONNECT_OPT_DRVR_START 1000
-#define SQL_PACKET_SIZE 112
-#define SQL_CONN_OPT_MAX SQL_PACKET_SIZE
-#define SQL_CONN_OPT_MIN SQL_ACCESS_MODE
-#define SQL_CONVERT_BIGINT 53
-#define SQL_CONVERT_BINARY 54
-#define SQL_CONVERT_BIT 55
-#define SQL_CONVERT_CHAR 56
-#define SQL_CONVERT_DATE 57
-#define SQL_CONVERT_DECIMAL 58
-#define SQL_CONVERT_DOUBLE 59
-#define SQL_CONVERT_FLOAT 60
-#define SQL_CONVERT_FUNCTIONS 48
-#define SQL_CONVERT_INTEGER 61
-#define SQL_CONVERT_LONGVARBINARY 71
-#define SQL_CONVERT_LONGVARCHAR 62
-#define SQL_CONVERT_NUMERIC 63
-#define SQL_CONVERT_REAL 64
-#define SQL_CONVERT_SMALLINT 65
-#define SQL_CONVERT_TIME 66
-#define SQL_CONVERT_TIMESTAMP 67
-#define SQL_CONVERT_TINYINT 68
-#define SQL_CONVERT_VARBINARY 69
-#define SQL_CONVERT_VARCHAR 70
-#define SQL_CORRELATION_NAME 74
-#define SQL_CR_CLOSE SQL_CB_CLOSE
-#define SQL_CR_DELETE SQL_CB_DELETE
-#define SQL_CR_PRESERVE SQL_CB_PRESERVE
-#define SQL_CURRENT_QUALIFIER 109
-#define SQL_CUR_DEFAULT SQL_CUR_USE_DRIVER
-#define SQL_CUR_USE_DRIVER 2UL
-#define SQL_CUR_USE_IF_NEEDED 0UL
-#define SQL_CUR_USE_ODBC 1UL
 #define SQL_CURSOR_COMMIT_BEHAVIOR 23
-#define SQL_CURSOR_DYNAMIC 2UL
-#define SQL_CURSOR_FORWARD_ONLY 0UL
-#define SQL_CURSOR_KEYSET_DRIVEN 1UL
-#define SQL_CURSOR_ROLLBACK_BEHAVIOR 24
-#define SQL_CURSOR_STATIC 3UL
-#define SQL_CURSOR_TYPE 6
-#define SQL_CURSOR_TYPE_DEFAULT SQL_CURSOR_FORWARD_ONLY
-#define SQL_CVT_BIGINT 0x00004000L
-#define SQL_CVT_BINARY 0x00000400L
-#define SQL_CVT_BIT 0x00001000L
-#define SQL_CVT_CHAR 1
-#define SQL_CVT_DATE 0x00008000L
-#define SQL_CVT_DECIMAL 4
-#define SQL_CVT_DOUBLE 128
-#define SQL_CVT_FLOAT 32
-#define SQL_CVT_INTEGER 8
-#define SQL_CVT_LONGVARBINARY 0x00040000L
-#define SQL_CVT_LONGVARCHAR 512
-#define SQL_CVT_NUMERIC 2
-#define SQL_CVT_REAL 64
-#define SQL_CVT_SMALLINT 16
-#define SQL_CVT_TIME 0x10000L
-#define SQL_CVT_TIMESTAMP 0x20000L
-#define SQL_CVT_TINYINT 0x2000L
-#define SQL_CVT_VARBINARY 0x800L
-#define SQL_CVT_VARCHAR 256
-#define SQL_DATABASE_NAME 16
 #define SQL_DATA_AT_EXEC (-2)
 #define SQL_DATA_SOURCE_NAME 2
 #define SQL_DATA_SOURCE_READ_ONLY 25
-#define SQL_DATE 9
 #define SQL_DBMS_NAME 17
 #define SQL_DBMS_VER 18
 #define SQL_DECIMAL 3
 #define SQL_DEFAULT_TXN_ISOLATION 26
 #define SQL_DOUBLE 8
-#define SQL_DRIVER_HDBC 3
-#define SQL_DRIVER_HENV 4
-#define SQL_DRIVER_HLIB 76
-#define SQL_DRIVER_HSTMT 5
-#define SQL_DRIVER_NAME 6
-#define SQL_DRIVER_ODBC_VER 77
-#define SQL_DRIVER_VER 7
 #define SQL_DROP 1
-#define SQL_ENSURE 1
 #define SQL_ERROR (-1)
-#define SQL_EXPRESSIONS_IN_ORDERBY 27
-#define SQL_EXT_API_LAST SQL_API_SQLBINDPARAMETER
-#define SQL_EXT_API_START 40
 #define SQL_FD_FETCH_ABSOLUTE 16
-#define SQL_FD_FETCH_BOOKMARK 128
 #define SQL_FD_FETCH_FIRST 2
 #define SQL_FD_FETCH_LAST 4
 #define SQL_FD_FETCH_NEXT 1
-#define SQL_FD_FETCH_PREV SQL_FD_FETCH_PRIOR
 #define SQL_FD_FETCH_PRIOR 8
 #define SQL_FD_FETCH_RELATIVE 32
-#define SQL_FD_FETCH_RESUME 64
+#define SQL_FETCH_ABSOLUTE 5
 #define SQL_FETCH_DIRECTION 8
 #define SQL_FETCH_FIRST 2
+#define SQL_FETCH_LAST 3
 #define SQL_FETCH_NEXT 1
-#define SQL_FETCH_PREV SQL_FETCH_PRIOR
-#define SQL_FETCH_RESUME 7
-#define SQL_FILE_NOT_SUPPORTED 0
-#define SQL_FILE_QUALIFIER 2
-#define SQL_FILE_TABLE 1
-#define SQL_FILE_USAGE 84
+#define SQL_FETCH_PRIOR 4
+#define SQL_FETCH_RELATIVE 6
 #define SQL_FLOAT 6
-#define SQL_FN_CVT_CONVERT 1
-#define SQL_FN_NUM_ABS 1
-#define SQL_FN_NUM_ACOS 2
-#define SQL_FN_NUM_ASIN 4
-#define SQL_FN_NUM_ATAN 8
-#define SQL_FN_NUM_ATAN2 16
-#define SQL_FN_NUM_CEILING 32
-#define SQL_FN_NUM_COS 64
-#define SQL_FN_NUM_COT 128
-#define SQL_FN_NUM_DEGREES 0x40000L
-#define SQL_FN_NUM_EXP 256
-#define SQL_FN_NUM_FLOOR 512
-#define SQL_FN_NUM_LOG 1024
-#define SQL_FN_NUM_LOG10 0x80000L
-#define SQL_FN_NUM_MOD 0x800L
-#define SQL_FN_NUM_PI 0x10000L
-#define SQL_FN_NUM_POWER 0x100000L
-#define SQL_FN_NUM_RADIANS 0x200000L
-#define SQL_FN_NUM_RAND 0x20000L
-#define SQL_FN_NUM_ROUND 0x400000L
-#define SQL_FN_NUM_SIGN 0x1000L
-#define SQL_FN_NUM_SIN 0x2000L
-#define SQL_FN_NUM_SQRT 0x00004000L
-#define SQL_FN_NUM_TAN 0x00008000L
-#define SQL_FN_NUM_TRUNCATE 0x00800000L
-#define SQL_FN_STR_ASCII 0x00002000L
-#define SQL_FN_STR_CHAR 0x00004000L
-#define SQL_FN_STR_CONCAT 1
-#define SQL_FN_STR_DIFFERENCE 0x00008000L
-#define SQL_FN_STR_INSERT 2
-#define SQL_FN_STR_LCASE 64
-#define SQL_FN_STR_LEFT 4
-#define SQL_FN_STR_LENGTH 16
-#define SQL_FN_STR_LOCATE 32
-#define SQL_FN_STR_LOCATE_2 0x00010000L
-#define SQL_FN_STR_LTRIM 8
-#define SQL_FN_STR_REPEAT 128
-#define SQL_FN_STR_REPLACE 256
-#define SQL_FN_STR_RIGHT 512
-#define SQL_FN_STR_RTRIM 1024
-#define SQL_FN_STR_SOUNDEX 0x00020000L
-#define SQL_FN_STR_SPACE 0x00040000L
-#define SQL_FN_STR_SUBSTRING 0x00000800L
-#define SQL_FN_STR_UCASE 0x00001000L
-#define SQL_FN_SYS_DBNAME 0x00000002L
-#define SQL_FN_SYS_IFNULL 0x00000004L
-#define SQL_FN_SYS_USERNAME 0x00000001L
-#define SQL_FN_TD_CURDATE 0x00000002L
-#define SQL_FN_TD_CURTIME 0x00000200L
-#define SQL_FN_TD_DAYNAME 0x00008000L
-#define SQL_FN_TD_DAYOFMONTH 0x00000004L
-#define SQL_FN_TD_DAYOFWEEK 0x00000008L
-#define SQL_FN_TD_DAYOFYEAR 0x00000010L
-#define SQL_FN_TD_HOUR 0x00000400L
-#define SQL_FN_TD_MINUTE 0x00000800L
-#define SQL_FN_TD_MONTH 32
-#define SQL_FN_TD_MONTHNAME 0x00010000L
-#define SQL_FN_TD_NOW 1
-#define SQL_FN_TD_QUARTER 64
-#define SQL_FN_TD_SECOND 0x00001000L
-#define SQL_FN_TD_TIMESTAMPADD 0x00002000L
-#define SQL_FN_TD_TIMESTAMPDIFF 0x00004000L
-#define SQL_FN_TD_WEEK 128
-#define SQL_FN_TD_YEAR 256
-#define SQL_FN_TSI_DAY 16
-#define SQL_FN_TSI_FRAC_SECOND 1
-#define SQL_FN_TSI_HOUR 8
-#define SQL_FN_TSI_MINUTE 4
-#define SQL_FN_TSI_MONTH 64
-#define SQL_FN_TSI_QUARTER 128
-#define SQL_FN_TSI_SECOND 2
-#define SQL_FN_TSI_WEEK 32
-#define SQL_FN_TSI_YEAR 256
-#define SQL_GB_GROUP_BY_CONTAINS_SELECT 2
-#define SQL_GB_GROUP_BY_EQUALS_SELECT 1
-#define SQL_GB_NOT_SUPPORTED 0
-#define SQL_GB_NO_RELATION 3
 #define SQL_GD_ANY_COLUMN 1
 #define SQL_GD_ANY_ORDER 2
-#define SQL_GD_BLOCK 4
-#define SQL_GD_BOUND 8
 #define SQL_GETDATA_EXTENSIONS 81
-#define SQL_GET_BOOKMARK 13
-#define SQL_GROUP_BY 88
 #define SQL_IC_LOWER 2
 #define SQL_IC_MIXED 4
 #define SQL_IC_SENSITIVE 3
@@ -347,358 +93,311 @@ extern "C" {
 #define SQL_INDEX_HASHED 2
 #define SQL_INDEX_OTHER 3
 #define SQL_INDEX_UNIQUE 0
-#define SQL_INFO_DRIVER_START 1000
-#define SQL_INFO_FIRST 0
-#define SQL_INFO_LAST SQL_QUALIFIER_LOCATION
 #define SQL_INTEGER 4
-#define SQL_INTERVAL_DAY (-83)
-#define SQL_INTERVAL_DAY_TO_HOUR (-87)
-#define SQL_INTERVAL_DAY_TO_MINUTE (-88)
-#define SQL_INTERVAL_DAY_TO_SECOND (-89)
-#define SQL_INTERVAL_HOUR (-84)
-#define SQL_INTERVAL_HOUR_TO_MINUTE (-90)
-#define SQL_INTERVAL_HOUR_TO_SECOND (-91)
-#define SQL_INTERVAL_MINUTE (-85)
-#define SQL_INTERVAL_MINUTE_TO_SECOND (-92)
-#define SQL_INTERVAL_MONTH (-81)
-#define SQL_INTERVAL_SECOND (-86)
-#define SQL_INTERVAL_YEAR (-80)
-#define SQL_INTERVAL_YEAR_TO_MONTH (-82)
+#define SQL_INTEGRITY 73
 #define SQL_INVALID_HANDLE (-2)
-#define SQL_KEYSET_SIZE 8
-#define SQL_KEYSET_SIZE_DEFAULT 0
-#define SQL_KEYWORDS 89
-#define SQL_LCK_EXCLUSIVE 2
-#define SQL_LCK_NO_CHANGE 1
-#define SQL_LCK_UNLOCK 4
-#define SQL_LIKE_ESCAPE_CLAUSE 113
-#define SQL_LIKE_ONLY 1
-#define SQL_LOCK_TYPES 78
-#define SQL_LOGIN_TIMEOUT 103
-#define SQL_LOGIN_TIMEOUT_DEFAULT 15UL
-#define SQL_LONGVARBINARY (-4)
-#define SQL_LONGVARCHAR (-1)
-#define SQL_MAX_BINARY_LITERAL_LEN 112
-#define SQL_MAX_CHAR_LITERAL_LEN 108
+#define SQL_MAX_CATALOG_NAME_LEN 34
+#define SQL_MAX_COLUMN_NAME_LEN 30
 #define SQL_MAX_COLUMNS_IN_GROUP_BY 97
 #define SQL_MAX_COLUMNS_IN_INDEX 98
 #define SQL_MAX_COLUMNS_IN_ORDER_BY 99
 #define SQL_MAX_COLUMNS_IN_SELECT 100
 #define SQL_MAX_COLUMNS_IN_TABLE 101
-#define SQL_MAX_COLUMN_NAME_LEN 30
 #define SQL_MAX_CURSOR_NAME_LEN 31
-#define SQL_MAX_DSN_LENGTH 32
 #define SQL_MAX_INDEX_SIZE 102
-#define SQL_MAX_LENGTH 3
-#define SQL_MAX_LENGTH_DEFAULT 0
 #define SQL_MAX_MESSAGE_LENGTH 512
-#define SQL_MAX_OPTION_STRING_LENGTH 256
-#define SQL_MAX_OWNER_NAME_LEN 32
-#define SQL_MAX_PROCEDURE_NAME_LEN 33
-#define SQL_MAX_QUALIFIER_NAME_LEN 34
-#define SQL_MAX_ROWS 1
-#define SQL_MAX_ROWS_DEFAULT 0UL
 #define SQL_MAX_ROW_SIZE 104
-#define SQL_MAX_ROW_SIZE_INCLUDES_LONG 103
+#define SQL_MAX_SCHEMA_NAME_LEN 32
 #define SQL_MAX_STATEMENT_LEN 105
-#define SQL_MAX_TABLES_IN_SELECT 106
 #define SQL_MAX_TABLE_NAME_LEN 35
+#define SQL_MAX_TABLES_IN_SELECT 106
 #define SQL_MAX_USER_NAME_LEN 107
-#define SQL_MODE_DEFAULT SQL_MODE_READ_WRITE
-#define SQL_MODE_READ_ONLY 1UL
-#define SQL_MODE_READ_WRITE 0UL
-#define SQL_MULTIPLE_ACTIVE_TXN 37
-#define SQL_MULT_RESULT_SETS 36
-#define SQL_NC_END 4
+#define SQL_MAXIMUM_CATALOG_NAME_LENGTH SQL_MAX_CATALOG_NAME_LEN
+#define SQL_MAXIMUM_COLUMN_NAME_LENGTH SQL_MAX_COLUMN_NAME_LEN
+#define SQL_MAXIMUM_COLUMNS_IN_GROUP_BY SQL_MAX_COLUMNS_IN_GROUP_BY
+#define SQL_MAXIMUM_COLUMNS_IN_INDEX SQL_MAX_COLUMNS_IN_INDEX
+#define SQL_MAXIMUM_COLUMNS_IN_ORDER_BY SQL_MAX_COLUMNS_IN_ORDER_BY
+#define SQL_MAXIMUM_COLUMNS_IN_SELECT SQL_MAX_COLUMNS_IN_SELECT
+#define SQL_MAXIMUM_CURSOR_NAME_LENGTH SQL_MAX_CURSOR_NAME_LEN
+#define SQL_MAXIMUM_INDEX_SIZE SQL_MAX_INDEX_SIZE
+#define SQL_MAXIMUM_ROW_SIZE SQL_MAX_ROW_SIZE
+#define SQL_MAXIMUM_SCHEMA_NAME_LENGTH SQL_MAX_SCHEMA_NAME_LEN
+#define SQL_MAXIMUM_STATEMENT_LENGTH SQL_MAX_STATEMENT_LEN
+#define SQL_MAXIMUM_TABLES_IN_SELECT SQL_MAX_TABLES_IN_SELECT
+#define SQL_MAXIMUM_USER_NAME_LENGTH SQL_MAX_USER_NAME_LEN
 #define SQL_NC_HIGH 0
 #define SQL_NC_LOW 1
-#define SQL_NC_START 2
 #define SQL_NEED_DATA 99
-#define SQL_NEED_LONG_DATA_LEN 111
-#define SQL_NNC_NON_NULL 1
-#define SQL_NNC_NULL 0
-#define SQL_NON_NULLABLE_COLUMNS 75
-#define SQL_NOSCAN 2
-#define SQL_NOSCAN_DEFAULT SQL_NOSCAN_OFF
-#define SQL_NOSCAN_OFF 0
-#define SQL_NOSCAN_ON 1
-#define SQL_NO_DATA 100
 #define SQL_NO_NULLS 0
-#define SQL_NO_TOTAL (-4)
 #define SQL_NTS (-3)
-#define SQL_NULLABLE 1
-#define SQL_NULLABLE_UNKNOWN 2
+#define SQL_NTSL (-3L)
 #define SQL_NULL_COLLATION 85
 #define SQL_NULL_DATA (-1)
 #define SQL_NULL_HDBC 0
 #define SQL_NULL_HENV 0
 #define SQL_NULL_HSTMT 0
+#define SQL_NULLABLE 1
+#define SQL_NULLABLE_UNKNOWN 2
 #define SQL_NUMERIC 2
-#define SQL_NUMERIC_FUNCTIONS 49
-#define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST-SQL_EXT_API_START+1)
-#define SQL_NUM_FUNCTIONS 23
-#define SQL_OAC_LEVEL1 1
-#define SQL_OAC_LEVEL2 2
-#define SQL_OAC_NONE 0
-#define SQL_ODBC_API_CONFORMANCE 9
-#define SQL_ODBC_CURSORS 110
-#define SQL_ODBC_KEYWORDS "ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
-"ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
-"BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
-"CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
-"COBOL,COLLATE,COLLATION,COLUMN,COMMIT,CONNECT,CONNECTION,CONSTRAINT,"\
-"CONSTRAINTS,CONTINUE,CONVERT,CORRESPONDING,COUNT,CREATE,CROSS,CURRENT,"\
-"CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,"\
-"DATE,DAY,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFERRABLE,"\
-"DEFERRED,DELETE,DESC,DESCRIBE,DESCRIPTOR,DIAGNOSTICS,DISCONNECT,"\
-"DISTINCT,DOMAIN,DOUBLE,DROP,""ELSE,END,END-EXEC,ESCAPE,EXCEPT,EXCEPTION,EXEC,EXECUTE,"\
-"EXISTS,EXTERNAL,EXTRACT,""FALSE,FETCH,FIRST,FLOAT,FOR,FOREIGN,FORTRAN,FOUND,FROM,FULL,"\
-"GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR,"\
-"IDENTITY,IMMEDIATE,IN,INCLUDE,INDEX,INDICATOR,INITIALLY,INNER,"\
-"INPUT,INSENSITIVE,INSERT,INTEGER,INTERSECT,INTERVAL,INTO,IS,ISOLATION,"\
-"JOIN,KEY,LANGUAGE,LAST,LEADING,LEFT,LEVEL,LIKE,LOCAL,LOWER,"\
-"MATCH,MAX,MIN,MINUTE,MODULE,MONTH,MUMPS,"\
-"NAMES,NATIONAL,NATURAL,NCHAR,NEXT,NO,NONE,NOT,NULL,NULLIF,NUMERIC,"\
-"OCTET_LENGTH,OF,ON,ONLY,OPEN,OPTION,OR,ORDER,OUTER,OUTPUT,OVERLAPS,"\
-"PAD,PARTIAL,PASCAL,PLI,POSITION,PRECISION,PREPARE,PRESERVE,"\
-"PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,"\
-"REFERENCES,RELATIVE,RESTRICT,REVOKE,RIGHT,ROLLBACK,ROWS,"\
-"SCHEMA,SCROLL,SECOND,SECTION,SELECT,SEQUENCE,SESSION,SESSION_USER,SET,SIZE,"\
-"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\
-"SUBSTRING,SUM,SYSTEM_USER,"\
-"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\
-"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\
-"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
-"VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,YEAR"
-#define SQL_ODBC_SAG_CLI_CONFORMANCE 12
-#define SQL_ODBC_SQL_CONFORMANCE 15
-#define SQL_ODBC_SQL_OPT_IEF 73
-#define SQL_ODBC_VER 10
-#define SQL_OJ_ALL_COMPARISON_OPS 64
-#define SQL_OJ_CAPABILITIES 65003
-#define SQL_OJ_FULL 4
-#define SQL_OJ_INNER 32
-#define SQL_OJ_LEFT 1
-#define SQL_OJ_NESTED 8
-#define SQL_OJ_NOT_ORDERED 16
-#define SQL_OJ_RIGHT 2
-#define SQL_OPT_TRACE_OFF 0
-#define SQL_OPT_TRACE_ON 1
-#define SQL_OPT_TRACE 104
-#define SQL_OPT_TRACEFILE 105
-#define SQL_OPT_TRACE_DEFAULT SQL_OPT_TRACE_OFF
-#define SQL_OPT_TRACE_FILE_DEFAULT "\\SQL.LOG"
 #define SQL_ORDER_BY_COLUMNS_IN_SELECT 90
-#define SQL_OSCC_COMPLIANT 1
-#define SQL_OSCC_NOT_COMPLIANT 0
-#define SQL_OSC_CORE 1
-#define SQL_OSC_EXTENDED 2
-#define SQL_OSC_MINIMUM 0
-#define SQL_OUTER_JOINS 38
-#define SQL_OU_DML_STATEMENTS 1
-#define SQL_OU_INDEX_DEFINITION 8
-#define SQL_OU_PRIVILEGE_DEFINITION 16
-#define SQL_OU_PROCEDURE_INVOCATION 2
-#define SQL_OU_TABLE_DEFINITION 4
-#define SQL_OWNER_TERM 39
-#define SQL_OWNER_USAGE 91
-#define SQL_PC_NOT_PSEUDO 1
 #define SQL_PC_PSEUDO 2
 #define SQL_PC_UNKNOWN 0
-#define SQL_PC_NON_PSEUDO SQL_PC_NOT_PSEUDO
-#define SQL_POSITIONED_STATEMENTS 80
-#define SQL_POS_ADD 16
-#define SQL_POS_DELETE 8
-#define SQL_POS_OPERATIONS 79
-#define SQL_POS_POSITION 1
-#define SQL_POS_REFRESH 2
-#define SQL_POS_UPDATE 4
-#define SQL_PROCEDURES 21
-#define SQL_PROCEDURE_TERM 40
-#define SQL_PS_POSITIONED_DELETE 1
-#define SQL_PS_POSITIONED_UPDATE 2
-#define SQL_PS_SELECT_FOR_UPDATE 4
-#define SQL_QL_END 2
-#define SQL_QL_START 1
-#define SQL_QUALIFIER_LOCATION 114
-#define SQL_QUALIFIER_NAME_SEPARATOR 41
-#define SQL_QUALIFIER_TERM 42
-#define SQL_QUALIFIER_USAGE 92
-#define SQL_QUERY_TIMEOUT 0
-#define SQL_QUERY_TIMEOUT_DEFAULT 0UL
-#define SQL_QUICK 0
-#define SQL_QUIET_MODE 111
-#define SQL_QUOTED_IDENTIFIER_CASE 93
-#define SQL_QU_DML_STATEMENTS 1
-#define SQL_QU_INDEX_DEFINITION 8
-#define SQL_QU_PRIVILEGE_DEFINITION 16
-#define SQL_QU_PROCEDURE_INVOCATION 2
-#define SQL_QU_TABLE_DEFINITION 4
-#define SQL_RD_DEFAULT SQL_RD_ON
-#define SQL_RD_OFF 0
-#define SQL_RD_ON 1
 #define SQL_REAL 7
 #define SQL_RESET_PARAMS 3
-#define SQL_RETRIEVE_DATA 11
 #define SQL_ROLLBACK 1
-#define SQL_ROWSET_SIZE 9
-#define SQL_ROWSET_SIZE_DEFAULT 1UL
-#define SQL_ROWVER 2
-#define SQL_ROW_NUMBER 14
-#define SQL_ROW_UPDATES 11
 #define SQL_SCCO_LOCK 2
 #define SQL_SCCO_OPT_ROWVER 4
-#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER
 #define SQL_SCCO_OPT_VALUES 8
 #define SQL_SCCO_READ_ONLY 1
 #define SQL_SCOPE_CURROW 0
 #define SQL_SCOPE_SESSION 2
 #define SQL_SCOPE_TRANSACTION 1
 #define SQL_SCROLL_CONCURRENCY 43
-#define SQL_SCROLL_DYNAMIC (-2L)
-#define SQL_SCROLL_FORWARD_ONLY 0
-#define SQL_SCROLL_KEYSET_DRIVEN (-1L)
-#define SQL_SCROLL_OPTIONS 44
-#define SQL_SCROLL_STATIC (-3L)
-#define SQL_SC_NON_UNIQUE 0
-#define SQL_SC_TRY_UNIQUE 1
-#define SQL_SC_UNIQUE 2
-#define SQL_SEARCHABLE 3
 #define SQL_SEARCH_PATTERN_ESCAPE 14
 #define SQL_SERVER_NAME 13
-#define SQL_SIGNED_OFFSET (-20)
-#define SQL_SIMULATE_CURSOR 10
 #define SQL_SMALLINT 5
-#define SQL_SO_DYNAMIC 4
-#define SQL_SO_FORWARD_ONLY 1
-#define SQL_SO_KEYSET_DRIVEN 2
-#define SQL_SO_MIXED 8
-#define SQL_SO_STATIC 16
 #define SQL_SPECIAL_CHARACTERS 94
-#define SQL_SQLSTATE_SIZE 5
-#define SQL_SQ_COMPARISON 1
-#define SQL_SQ_CORRELATED_SUBQUERIES 16
-#define SQL_SQ_EXISTS 2
-#define SQL_SQ_IN 4
-#define SQL_SQ_QUANTIFIED 8
-#define SQL_SS_ADDITIONS 1
-#define SQL_SS_DELETIONS 2
-#define SQL_SS_UPDATES 4
-#define SQL_STATIC_SENSITIVITY 83
 #define SQL_STILL_EXECUTING 2
-#define SQL_STMT_OPT_MAX SQL_ROW_NUMBER
-#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT
-#define SQL_STRING_FUNCTIONS 50
-#define SQL_SUBQUERIES 95
+#define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
 #define SQL_SUCCESS 0
 #define SQL_SUCCESS_WITH_INFO 1
-#define SQL_SYSTEM_FUNCTIONS 51
-#define SQL_TABLE_STAT 0
-#define SQL_TABLE_TERM 45
-#define SQL_TC_ALL 0x0002
+#define SQL_TC_ALL 2
 #define SQL_TC_DDL_COMMIT 3
 #define SQL_TC_DDL_IGNORE 4
 #define SQL_TC_DML 1
 #define SQL_TC_NONE 0
-#define SQL_TIME 10
-#define SQL_TIMEDATE_ADD_INTERVALS 109
-#define SQL_TIMEDATE_DIFF_INTERVALS 110
-#define SQL_TIMEDATE_FUNCTIONS 52
-#define SQL_TIMESTAMP 11
-#define SQL_TINYINT (-6)
-#define SQL_TRANSLATE_DLL 106
-#define SQL_TRANSLATE_OPTION 107
+#define SQL_TRANSACTION_CAPABLE SQL_TXN_CAPABLE
+#define SQL_TRANSACTION_ISOLATION_OPTION SQL_TXN_ISOLATION_OPTION
+#define SQL_TRANSACTION_READ_COMMITTED SQL_TXN_READ_COMMITTED
+#define SQL_TRANSACTION_READ_UNCOMMITTED SQL_TXN_READ_UNCOMMITTED
+#define SQL_TRANSACTION_REPEATABLE_READ SQL_TXN_REPEATABLE_READ
+#define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE
 #define SQL_TXN_CAPABLE 46
-#define SQL_TXN_ISOLATION 108
 #define SQL_TXN_ISOLATION_OPTION 72
 #define SQL_TXN_READ_COMMITTED 2
 #define SQL_TXN_READ_UNCOMMITTED 1
 #define SQL_TXN_REPEATABLE_READ 4
 #define SQL_TXN_SERIALIZABLE 8
-#define SQL_TXN_VERSIONING 16
-#define SQL_TYPE_NULL 0
-#define SQL_UB_OFF 0
-#define SQL_UB_ON 1
 #define SQL_UNBIND 2
-#define SQL_UNICODE (-95)
-#define SQL_UNICODE_CHAR SQL_UNICODE
-#define SQL_UNICODE_LONGVARCHAR (-97)
-#define SQL_UNICODE_VARCHAR (-96)
-#define SQL_UNION 96
-#define SQL_UNSEARCHABLE 0
-#define SQL_UNSIGNED_OFFSET (-22)
+#define SQL_UNKNOWN_TYPE 0
 #define SQL_USER_NAME 47
-#define SQL_USE_BOOKMARKS 12
-#define SQL_U_UNION 1
-#define SQL_U_UNION_ALL 2
-#define SQL_VARBINARY (-3)
 #define SQL_VARCHAR 12
-#define SQL_C_BINARY SQL_BINARY
-#define SQL_C_BIT SQL_BIT
-#define SQL_C_BOOKMARK SQL_C_ULONG
-#define SQL_C_CHAR SQL_CHAR
-#define SQL_C_DATE SQL_DATE
-#define SQL_C_DEFAULT 99
-#define SQL_C_DOUBLE SQL_DOUBLE
-#define SQL_C_FLOAT SQL_REAL
-#define SQL_C_LONG SQL_INTEGER
-#define SQL_C_SHORT SQL_SMALLINT
-#define SQL_C_SLONG SQL_C_LONG+SQL_SIGNED_OFFSET
-#define SQL_C_SSHORT SQL_C_SHORT+SQL_SIGNED_OFFSET
-#define SQL_C_STINYINT SQL_TINYINT+SQL_SIGNED_OFFSET
-#define SQL_C_TIME SQL_TIME
-#define SQL_C_TIMESTAMP SQL_TIMESTAMP
-#define SQL_C_TINYINT SQL_TINYINT
-#define SQL_C_ULONG SQL_C_LONG+SQL_UNSIGNED_OFFSET
-#define SQL_C_USHORT SQL_C_SHORT+SQL_UNSIGNED_OFFSET
-#define SQL_C_UTINYINT SQL_TINYINT+SQL_UNSIGNED_OFFSET
-#define SQL_TYPE_DRIVER_END SQL_UNICODE_LONGVARCHAR
-#define SQL_TYPE_DRIVER_START SQL_INTERVAL_YEAR
-#define SQL_TYPE_MAX SQL_VARCHAR
-#define SQL_TYPE_MIN SQL_BIT
-#define SQL_UB_DEFAULT SQL_UB_OFF
+#if (ODBCVER >= 0x0200)
+#define SQL_AT_ADD_COLUMN 1
+#define SQL_AT_DROP_COLUMN 2
+#endif /* ODBCVER >= 0x0200 */
+#if (ODBCVER >= 0x0201)
+#define SQL_OJ_LEFT 1
+#define SQL_OJ_RIGHT 2
+#define SQL_OJ_FULL 4
+#define SQL_OJ_NESTED 8
+#define SQL_OJ_NOT_ORDERED 16
+#define SQL_OJ_INNER 32
+#define SQL_OJ_ALL_COMPARISON_OPS 64
+#endif /* ODBCVER >= 0x0201 */ 
+#if (ODBCVER >= 0x0300)   
+#define SQL_AM_CONNECTION 1
+#define SQL_AM_NONE 0
+#define SQL_AM_STATEMENT 2
+#define SQL_API_SQLALLOCHANDLE 1001
+#define SQL_API_SQLBINDPARAM 1002
+#define SQL_API_SQLCLOSECURSOR 1003
+#define SQL_API_SQLCOLATTRIBUTE 6
+#define SQL_API_SQLCOPYDESC 1004
+#define SQL_API_SQLENDTRAN 1005
+#define SQL_API_SQLFETCHSCROLL 1021
+#define SQL_API_SQLFREEHANDLE 1006
+#define SQL_API_SQLGETCONNECTATTR 1007
+#define SQL_API_SQLGETDESCFIELD 1008
+#define SQL_API_SQLGETDESCREC 1009
+#define SQL_API_SQLGETDIAGFIELD 1010
+#define SQL_API_SQLGETDIAGREC 1011
+#define SQL_API_SQLGETENVATTR 1012
+#define SQL_API_SQLGETSTMTATTR 1014
+#define SQL_API_SQLSETCONNECTATTR 1016
+#define SQL_API_SQLSETDESCFIELD 1017
+#define SQL_API_SQLSETDESCREC 1018
+#define SQL_API_SQLSETENVATTR 1019
+#define SQL_API_SQLSETSTMTATTR 1020
+#define SQL_ARD_TYPE (-99)
+#define SQL_AT_ADD_CONSTRAINT 8
+#define SQL_ATTR_APP_PARAM_DESC 10011
+#define SQL_ATTR_APP_ROW_DESC 10010
+#define SQL_ATTR_AUTO_IPD 10001
+#define SQL_ATTR_CURSOR_SCROLLABLE (-1)
+#define SQL_ATTR_CURSOR_SENSITIVITY (-2)
+#define SQL_ATTR_IMP_PARAM_DESC 10013
+#define SQL_ATTR_IMP_ROW_DESC 10012
+#define SQL_ATTR_METADATA_ID 10014
+#define SQL_ATTR_OUTPUT_NTS 10001
+#define SQL_CATALOG_NAME 10003
+#define SQL_CODE_DATE 1
+#define SQL_CODE_TIME 2
+#define SQL_CODE_TIMESTAMP 3
+#define SQL_COLLATION_SEQ 10004
+#define SQL_CURSOR_SENSITIVITY 10001
+#define SQL_DATE_LEN 10
+#define SQL_DATETIME 9
+#define SQL_DEFAULT 99
+#define SQL_DESC_ALLOC_AUTO 1
+#define SQL_DESC_ALLOC_TYPE 1099
+#define SQL_DESC_ALLOC_USER 2
+#define SQL_DESC_COUNT 1001
+#define SQL_DESC_DATA_PTR 1010
+#define SQL_DESC_DATETIME_INTERVAL_CODE 1007
+#define SQL_DESC_INDICATOR_PTR 1009
+#define SQL_DESC_LENGTH 1003
+#define SQL_DESC_NAME 1011
+#define SQL_DESC_NULLABLE 1008
+#define SQL_DESC_OCTET_LENGTH 1013
+#define SQL_DESC_OCTET_LENGTH_PTR 1004
+#define SQL_DESC_PRECISION 1005
+#define SQL_DESC_SCALE 1006
+#define SQL_DESC_TYPE 1002
+#define SQL_DESC_UNNAMED 1012
+#define SQL_DESCRIBE_PARAMETER 10002
+#define SQL_DIAG_ALTER_DOMAIN 3
+#define SQL_DIAG_ALTER_TABLE 4
+#define SQL_DIAG_CALL 7
+#define SQL_DIAG_CLASS_ORIGIN 8
+#define SQL_DIAG_CONNECTION_NAME 10
+#define SQL_DIAG_CREATE_ASSERTION 6
+#define SQL_DIAG_CREATE_CHARACTER_SET 8
+#define SQL_DIAG_CREATE_COLLATION 10
+#define SQL_DIAG_CREATE_DOMAIN 23
+#define SQL_DIAG_CREATE_INDEX (-1)
+#define SQL_DIAG_CREATE_SCHEMA 64
+#define SQL_DIAG_CREATE_TABLE 77
+#define SQL_DIAG_CREATE_TRANSLATION 79
+#define SQL_DIAG_CREATE_VIEW 84
+#define SQL_DIAG_DELETE_WHERE 19
+#define SQL_DIAG_DROP_ASSERTION 24
+#define SQL_DIAG_DROP_CHARACTER_SET 25
+#define SQL_DIAG_DROP_COLLATION 26
+#define SQL_DIAG_DROP_DOMAIN 27
+#define SQL_DIAG_DROP_INDEX (-2)
+#define SQL_DIAG_DROP_SCHEMA 31
+#define SQL_DIAG_DROP_TABLE 32
+#define SQL_DIAG_DROP_TRANSLATION 33
+#define SQL_DIAG_DROP_VIEW 36
+#define SQL_DIAG_DYNAMIC_DELETE_CURSOR 38
+#define SQL_DIAG_DYNAMIC_FUNCTION 7
+#define SQL_DIAG_DYNAMIC_FUNCTION_CODE 12
+#define SQL_DIAG_DYNAMIC_UPDATE_CURSOR 81
+#define SQL_DIAG_GRANT 48
+#define SQL_DIAG_INSERT 50
+#define SQL_DIAG_MESSAGE_TEXT 6
+#define SQL_DIAG_NATIVE 5
+#define SQL_DIAG_NUMBER 2
+#define SQL_DIAG_RETURNCODE 1
+#define SQL_DIAG_REVOKE 59
+#define SQL_DIAG_ROW_COUNT 3
+#define SQL_DIAG_SELECT_CURSOR 85
+#define SQL_DIAG_SERVER_NAME 11
+#define SQL_DIAG_SQLSTATE 4
+#define SQL_DIAG_SUBCLASS_ORIGIN 9
+#define SQL_DIAG_UNKNOWN_STATEMENT 0
+#define SQL_DIAG_UPDATE_WHERE 82
+#define SQL_FALSE 0
+#define SQL_HANDLE_DBC 2
+#define SQL_HANDLE_DESC 4
+#define SQL_HANDLE_ENV 1
+#define SQL_HANDLE_STMT 3
+#define SQL_INSENSITIVE 1
+#define SQL_MAX_CONCURRENT_ACTIVITIES 1
+#define SQL_MAX_DRIVER_CONNECTIONS 0
+#define SQL_MAX_IDENTIFIER_LEN 10005
+#define SQL_MAXIMUM_CONCURRENT_ACTIVITIES SQL_MAX_CONCURRENT_ACTIVITIES
+#define SQL_MAXIMUM_DRIVER_CONNECTIONS SQL_MAX_DRIVER_CONNECTIONS
+#define SQL_MAXIMUM_IDENTIFIER_LENGTH SQL_MAX_IDENTIFIER_LEN
+#define SQL_NAMED 0
+#define SQL_NO_DATA 100
+#define SQL_NONSCROLLABLE 0
+#define SQL_NULL_HANDLE 0L
+#define SQL_NULL_HDESC 0
+#define SQL_OJ_CAPABILITIES 115
+#define SQL_OUTER_JOIN_CAPABILITIES SQL_OJ_CAPABILITIES
+#define SQL_PC_NON_PSEUDO 1
+#define SQL_PRED_BASIC 2
+#define SQL_PRED_CHAR 1
+#define SQL_PRED_NONE 0
+#define SQL_ROW_IDENTIFIER 1
+#define SQL_SCROLLABLE 1
+#define SQL_SENSITIVE 2
+#define SQL_TIME_LEN 8
+#define SQL_TIMESTAMP_LEN 19
+#define SQL_TRUE 1
+#define SQL_TYPE_DATE 91
+#define SQL_TYPE_TIME 92
+#define SQL_TYPE_TIMESTAMP 93
+#define SQL_UNNAMED 1
+#define SQL_UNSPECIFIED 0
+#define SQL_XOPEN_CLI_YEAR 10000
+#endif /* ODBCVER >= 0x0300 */
 
-SQLRETURN SQL_API SQLAllocConnect(SQLHENV,SQLHDBC*);
-SQLRETURN SQL_API SQLAllocEnv(SQLHENV *);
-SQLRETURN SQL_API SQLAllocStmt(SQLHDBC,SQLHSTMT*);
-SQLRETURN SQL_API SQLAllocHandle(SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
-SQLRETURN SQL_API SQLBindCol(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
+#ifndef RC_INVOKED
+SQLRETURN SQL_API SQLAllocConnect(SQLHENV,SQLHDBC*); /* deprecated */
+SQLRETURN SQL_API SQLAllocEnv(SQLHENV*); /* deprecated */
+SQLRETURN SQL_API SQLAllocStmt(SQLHDBC,SQLHSTMT*); /* deprecated */
+SQLRETURN SQL_API SQLBindCol(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*);
 SQLRETURN SQL_API SQLCancel(SQLHSTMT);
-SQLRETURN SQL_API SQLColAttributes(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLINTEGER*);
 SQLRETURN SQL_API SQLConnect(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLDescribeCol(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLUINTEGER*,SQLSMALLINT*,SQLSMALLINT*);
+SQLRETURN SQL_API SQLDescribeCol(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*);
 SQLRETURN SQL_API SQLDisconnect(SQLHDBC);
-SQLRETURN SQL_API SQLError(SQLHENV,SQLHDBC,SQLHSTMT,SQLCHAR*,SQLINTEGER*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
+SQLRETURN SQL_API SQLError(SQLHENV,SQLHDBC,SQLHSTMT,SQLCHAR*,SQLINTEGER*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); /* deprecated */
 SQLRETURN SQL_API SQLExecDirect(SQLHSTMT,SQLCHAR*,SQLINTEGER);
 SQLRETURN SQL_API SQLExecute(SQLHSTMT);
 SQLRETURN SQL_API SQLFetch(SQLHSTMT);
-SQLRETURN SQL_API SQLFreeConnect(SQLHDBC);
-SQLRETURN SQL_API SQLFreeEnv(SQLHENV);
-SQLRETURN SQL_API SQLFreeStmt(SQLHSTMT,SQLUSMALLINT);
-SQLRETURN SQL_API SQLFreeHandle(SQLSMALLINT,SQLHANDLE);
+SQLRETURN SQL_API SQLFreeConnect(SQLHDBC); /* deprecated */
+SQLRETURN SQL_API SQLFreeEnv(SQLHENV); /* deprecated */
+SQLRETURN SQL_API SQLFreeStmt(SQLHSTMT,SQLUSMALLINT); 
 SQLRETURN SQL_API SQLGetCursorName(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
 SQLRETURN SQL_API SQLNumResultCols(SQLHSTMT,SQLSMALLINT*);
 SQLRETURN SQL_API SQLPrepare(SQLHSTMT,SQLCHAR*,SQLINTEGER);
-SQLRETURN SQL_API SQLRowCount(SQLHSTMT,SQLINTEGER*);
+SQLRETURN SQL_API SQLRowCount(SQLHSTMT,SQLLEN*);
 SQLRETURN SQL_API SQLSetCursorName(SQLHSTMT,SQLCHAR*,SQLSMALLINT);
 SQLRETURN SQL_API SQLTransact(SQLHENV,SQLHDBC,SQLUSMALLINT);
-SQLRETURN SQL_API SQLSetParam(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLUINTEGER,SQLSMALLINT,SQLPOINTER,SQLINTEGER*);
+SQLRETURN SQL_API SQLSetParam(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN*); /* deprecated */
 SQLRETURN SQL_API SQLColumns(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLGetConnectOption(SQLHDBC,SQLUSMALLINT,SQLPOINTER);
-SQLRETURN SQL_API SQLGetData(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
+SQLRETURN SQL_API SQLGetConnectOption(SQLHDBC,SQLUSMALLINT,SQLPOINTER); /* deprecated */
+SQLRETURN SQL_API SQLGetData(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*);
 SQLRETURN SQL_API SQLGetFunctions(SQLHDBC,SQLUSMALLINT,SQLUSMALLINT*);
 SQLRETURN SQL_API SQLGetInfo(SQLHDBC,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetStmtOption(SQLHSTMT,SQLUSMALLINT,SQLPOINTER);
+SQLRETURN SQL_API SQLGetStmtOption(SQLHSTMT,SQLUSMALLINT,SQLPOINTER); /* deprecated */
 SQLRETURN SQL_API SQLGetTypeInfo(SQLHSTMT,SQLSMALLINT);
 SQLRETURN SQL_API SQLParamData(SQLHSTMT,SQLPOINTER*);
-SQLRETURN SQL_API SQLPutData(SQLHSTMT,SQLPOINTER,SQLINTEGER);
-SQLRETURN SQL_API SQLSetConnectOption(SQLHDBC,SQLUSMALLINT,SQLUINTEGER);
-SQLRETURN SQL_API SQLSetStmtOption(SQLHSTMT,SQLUSMALLINT,SQLUINTEGER);
-SQLRETURN SQL_API SQLSpecialColumns(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLUSMALLINT,SQLUSMALLINT fNullable);
+SQLRETURN SQL_API SQLPutData(SQLHSTMT,SQLPOINTER,SQLLEN);
+SQLRETURN SQL_API SQLSetConnectOption(SQLHDBC,SQLUSMALLINT,SQLULEN); /* deprecated */
+SQLRETURN SQL_API SQLSetStmtOption(SQLHSTMT,SQLUSMALLINT,SQLROWCOUNT); /* deprecated */
+SQLRETURN SQL_API SQLSpecialColumns(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLUSMALLINT,SQLUSMALLINT);
 SQLRETURN SQL_API SQLStatistics(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLUSMALLINT,SQLUSMALLINT);
 SQLRETURN SQL_API SQLTables(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
 SQLRETURN SQL_API SQLDataSources(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLSetScrollOptions(SQLHSTMT,SQLUSMALLINT,SQLINTEGER,SQLUSMALLINT);
+#if (ODBCVER >= 0x0300)
+SQLRETURN SQL_API SQLAllocHandle(SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
+SQLRETURN SQL_API SQLBindParam(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN*);
+SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT); 
+SQLRETURN SQL_API SQLColAttribute(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER);
+SQLRETURN SQL_API SQLCopyDesc(SQLHDESC,SQLHDESC);
+SQLRETURN SQL_API SQLEndTran(SQLSMALLINT,SQLHANDLE,SQLSMALLINT);
+SQLRETURN SQL_API SQLFetchScroll(SQLHSTMT,SQLSMALLINT,SQLROWOFFSET);
+SQLRETURN SQL_API SQLFreeHandle(SQLSMALLINT,SQLHANDLE);
+SQLRETURN SQL_API SQLGetConnectAttr(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
+SQLRETURN SQL_API SQLGetDescField(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*); 
+SQLRETURN SQL_API SQLGetDescRec(SQLHDESC,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,
+    SQLSMALLINT*,SQLSMALLINT*,SQLLEN*,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*); 
+SQLRETURN SQL_API SQLGetDiagField(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*); 
+SQLRETURN SQL_API SQLGetDiagRec(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLCHAR*,SQLINTEGER*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); 
+SQLRETURN SQL_API SQLGetEnvAttr(SQLHENV,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
+SQLRETURN SQL_API SQLGetStmtAttr(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
+SQLRETURN SQL_API SQLSetConnectAttr(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER);
+SQLRETURN SQL_API SQLSetDescField(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER); 
+SQLRETURN SQL_API SQLSetDescRec(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLLEN,SQLSMALLINT,
+    SQLSMALLINT,SQLPOINTER,SQLLEN*,SQLLEN*); 
+SQLRETURN SQL_API SQLSetEnvAttr(SQLHENV,SQLINTEGER,SQLPOINTER,SQLINTEGER);
+SQLRETURN SQL_API SQLSetStmtAttr(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER);
+#endif  /* (ODBCVER >= 0x0300) */
+#endif /* ndef RC_INVOKED */
 #ifdef __cplusplus
 }
 #endif
diff --git a/winsup/w32api/include/sqlext.h b/winsup/w32api/include/sqlext.h
index fc0538601..17235bd58 100644
--- a/winsup/w32api/include/sqlext.h
+++ b/winsup/w32api/include/sqlext.h
@@ -4,62 +4,1184 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#define SQL_SPEC_MAJOR 3
+#define SQL_SPEC_MINOR	51
+#define SQL_SPEC_STRING "03.51"
+#define SQL_ACCESS_MODE 101
+#define SQL_ACTIVE_CONNECTIONS 0
+#define SQL_ACTIVE_STATEMENTS 1
+#define SQL_ADD 4
+#define SQL_ALL_EXCEPT_LIKE 2
+#define SQL_API_ALL_FUNCTIONS 0
+#define SQL_API_LOADBYORDINAL 199
+#define SQL_API_SQLBINDPARAMETER 72
+#define SQL_API_SQLBROWSECONNECT 55
+#define SQL_API_SQLCOLATTRIBUTES 6
+#define SQL_API_SQLCOLUMNPRIVILEGES 56
+#define SQL_API_SQLDESCRIBEPARAM 58
+#define SQL_API_SQLDRIVERCONNECT 41
+#define SQL_API_SQLDRIVERS 71
+#define SQL_API_SQLEXTENDEDFETCH 59
+#define SQL_API_SQLFOREIGNKEYS 60
+#define SQL_API_SQLMORERESULTS 61
+#define SQL_API_SQLNATIVESQL 62
+#define SQL_API_SQLNUMPARAMS 63
+#define SQL_API_SQLPARAMOPTIONS 64
+#define SQL_API_SQLPRIMARYKEYS 65
+#define SQL_API_SQLPROCEDURECOLUMNS 66
+#define SQL_API_SQLPROCEDURES 67
+#define SQL_API_SQLSETPOS 68
+#define SQL_API_SQLSETSCROLLOPTIONS 69
+#define SQL_API_SQLTABLEPRIVILEGES 70
+#define SQL_ASYNC_ENABLE 4
+#define SQL_ASYNC_ENABLE_DEFAULT SQL_ASYNC_ENABLE_OFF
+#define SQL_ASYNC_ENABLE_OFF 0UL
+#define SQL_ASYNC_ENABLE_ON 1UL
+#define SQL_ATTR_CONNECTION_DEAD 1209
+#define SQL_ATTR_READONLY 0
+#define SQL_ATTR_READWRITE_UNKNOWN 2
+#define SQL_ATTR_WRITE 1
+#define SQL_AUTOCOMMIT 102
+#define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON
+#define SQL_AUTOCOMMIT_OFF 0UL
+#define SQL_AUTOCOMMIT_ON 1UL
+#define SQL_BEST_ROWID 1
+#define SQL_BIGINT (-5)
+#define SQL_BINARY (-2)
+#define SQL_BIND_BY_COLUMN 0UL
+#define SQL_BIND_TYPE 5
+#define SQL_BIND_TYPE_DEFAULT SQL_BIND_BY_COLUMN
+#define SQL_BIT (-7)
+#define SQL_BOOKMARK_PERSISTENCE 82
+#define SQL_BP_CLOSE 1
+#define SQL_BP_DELETE 2
+#define SQL_BP_DROP 4
+#define SQL_BP_OTHER_HSTMT 32
+#define SQL_BP_SCROLL 64
+#define SQL_BP_TRANSACTION 8
+#define SQL_BP_UPDATE 16
+#define SQL_C_BINARY SQL_BINARY
+#define SQL_C_BIT SQL_BIT
+#define SQL_C_BOOKMARK SQL_C_ULONG
+#define SQL_C_CHAR SQL_CHAR
+#define SQL_C_DATE SQL_DATE
+#define SQL_C_DEFAULT 99
+#define SQL_C_DOUBLE SQL_DOUBLE
+#define SQL_C_FLOAT SQL_REAL
+#define SQL_C_LONG SQL_INTEGER
+#define SQL_C_SHORT SQL_SMALLINT
+#define SQL_C_SLONG (SQL_C_LONG+SQL_SIGNED_OFFSET)
+#define SQL_C_SSHORT (SQL_C_SHORT+SQL_SIGNED_OFFSET)
+#define SQL_C_STINYINT (SQL_TINYINT+SQL_SIGNED_OFFSET)
+#define SQL_C_TIME SQL_TIME
+#define SQL_C_TIMESTAMP SQL_TIMESTAMP
+#define SQL_C_TINYINT SQL_TINYINT
+#define SQL_C_ULONG (SQL_C_LONG+SQL_UNSIGNED_OFFSET)
+#define SQL_C_USHORT (SQL_C_SHORT+SQL_UNSIGNED_OFFSET)
+#define SQL_C_UTINYINT (SQL_TINYINT+SQL_UNSIGNED_OFFSET)
+#define SQL_CASCADE 0
+#define SQL_CB_NON_NULL 1
+#define SQL_CB_NULL 0
+#define SQL_CC_CLOSE SQL_CB_CLOSE /* deprecated */
+#define SQL_CC_DELETE SQL_CB_DELETE /* deprecated */
+#define SQL_CC_PRESERVE SQL_CB_PRESERVE /* deprecated */
+#define SQL_CD_FALSE 0L
+#define SQL_CD_TRUE 1L
+#define SQL_CN_ANY 2
+#define SQL_CN_DIFFERENT 1
+#define SQL_CN_NONE 0
+#define SQL_COLATT_OPT_MAX SQL_COLUMN_LABEL
+#define SQL_COLATT_OPT_MIN SQL_COLUMN_COUNT
+#define SQL_COLUMN_ALIAS 87
+#define SQL_COLUMN_AUTO_INCREMENT 11
+#define SQL_COLUMN_CASE_SENSITIVE 12
+#define SQL_COLUMN_COUNT 0
+#define SQL_COLUMN_DISPLAY_SIZE 6
+#define SQL_COLUMN_LABEL 18
+#define SQL_COLUMN_LENGTH 3
+#define SQL_COLUMN_MONEY 9
+#define SQL_COLUMN_NAME 1
+#define SQL_COLUMN_NULLABLE 7
+#define SQL_COLUMN_OWNER_NAME 16
+#define SQL_COLUMN_PRECISION 4
+#define SQL_COLUMN_QUALIFIER_NAME 17
+#define SQL_COLUMN_SCALE 5
+#define SQL_COLUMN_SEARCHABLE 13
+#define SQL_COLUMN_TABLE_NAME 15
+#define SQL_COLUMN_TYPE 2
+#define SQL_COLUMN_TYPE_NAME 14
+#define SQL_COLUMN_UNSIGNED 8
+#define SQL_COLUMN_UPDATABLE 10
+#define SQL_CONCAT_NULL_BEHAVIOR 22
+#define SQL_CONCUR_DEFAULT SQL_CONCUR_READ_ONLY
+#define SQL_CONCUR_LOCK 2
+#define SQL_CONCUR_READ_ONLY 1
+#define SQL_CONCUR_ROWVER 3
+#define SQL_CONCUR_TIMESTAMP SQL_CONCUR_ROWVER /* deprecated */
+#define SQL_CONCUR_VALUES 4
+#define SQL_CONCURRENCY 7
+#define SQL_CONVERT_BIGINT 53
+#define SQL_CONVERT_BINARY 54
+#define SQL_CONVERT_BIT 55
+#define SQL_CONVERT_CHAR 56
+#define SQL_CONVERT_DATE 57
+#define SQL_CONVERT_DECIMAL 58
+#define SQL_CONVERT_DOUBLE 59
+#define SQL_CONVERT_FLOAT 60
+#define SQL_CONVERT_FUNCTIONS 48
+#define SQL_CONVERT_INTEGER 61
+#define SQL_CONVERT_LONGVARBINARY 71
+#define SQL_CONVERT_LONGVARCHAR 62
+#define SQL_CONVERT_NUMERIC 63
+#define SQL_CONVERT_REAL 64
+#define SQL_CONVERT_SMALLINT 65
+#define SQL_CONVERT_TIME 66
+#define SQL_CONVERT_TIMESTAMP 67
+#define SQL_CONVERT_TINYINT 68
+#define SQL_CONVERT_VARBINARY 69
+#define SQL_CONVERT_VARCHAR 70
+#define SQL_CORRELATION_NAME 74
+#define SQL_CR_CLOSE SQL_CB_CLOSE /* deprecated */
+#define SQL_CR_DELETE SQL_CB_DELETE /* deprecated */
+#define SQL_CR_PRESERVE SQL_CB_PRESERVE /* deprecated */
+#define SQL_CUR_DEFAULT SQL_CUR_USE_DRIVER
+#define SQL_CUR_USE_DRIVER 2UL
+#define SQL_CUR_USE_IF_NEEDED 0UL
+#define SQL_CUR_USE_ODBC 1UL
+#define SQL_CURRENT_QUALIFIER 109
+#define SQL_CURSOR_DYNAMIC 2UL
+#define SQL_CURSOR_FORWARD_ONLY 0UL
+#define SQL_CURSOR_KEYSET_DRIVEN 1UL
+#define SQL_CURSOR_ROLLBACK_BEHAVIOR 24
+#define SQL_CURSOR_STATIC 3UL
+#define SQL_CURSOR_TYPE 6
+#define SQL_CURSOR_TYPE_DEFAULT SQL_CURSOR_FORWARD_ONLY
+#define SQL_CV_CASCADED 0x00000004L
+#define SQL_CV_CHECK_OPTION 0x00000002L
+#define SQL_CV_CREATE_VIEW 0x00000001L
+#define SQL_CV_LOCAL 0x00000008L
+#define SQL_CVT_BIGINT 0x00004000L
+#define SQL_CVT_BINARY 0x00000400L
+#define SQL_CVT_BIT 0x00001000L
+#define SQL_CVT_CHAR 0x00000001L
+#define SQL_CVT_DATE 0x00008000L
+#define SQL_CVT_DECIMAL 0x00000004L
+#define SQL_CVT_DOUBLE 0x00000080L
+#define SQL_CVT_FLOAT 0x00000020L
+#define SQL_CVT_INTEGER 0x00000008L
+#define SQL_CVT_LONGVARBINARY 0x00040000L
+#define SQL_CVT_LONGVARCHAR 0x00000200L
+#define SQL_CVT_NUMERIC 0x00000002L
+#define SQL_CVT_REAL 0x00000040L
+#define SQL_CVT_SMALLINT 0x00000010L
+#define SQL_CVT_TIME 0x00010000L
+#define SQL_CVT_TIMESTAMP 0x00020000L
+#define SQL_CVT_TINYINT 0x00002000L
+#define SQL_CVT_VARBINARY 0x00000800L
+#define SQL_CVT_VARCHAR 0x00000100L
+#define SQL_DATABASE_NAME 16 /* deprecated */
+#define SQL_DATE 9
 #define SQL_DEFAULT_PARAM (-5)
-#define SQL_IGNORE (-6)
-#define SQL_LEN_DATA_AT_EXEC_OFFSET (-100)
-#define SQL_LEN_DATA_AT_EXEC(l) (-l+SQL_LEN_DATA_AT_EXEC_OFFSET)
-#define SQL_ENTIRE_ROWSET 0
-#define SQL_POSITION 0
-#define SQL_REFRESH 1
-#define SQL_UPDATE 2
 #define SQL_DELETE 3
-#define SQL_ADD 4
-#define SQL_LOCK_NO_CHANGE 0
-#define SQL_LOCK_EXCLUSIVE 1
-#define SQL_LOCK_UNLOCK 2
-#define SQL_POSITION_TO(s,r) SQLSetPos(s,r,SQL_POSITION,SQL_LOCK_NO_CHANGE)
-#define SQL_LOCK_RECORD(s,i,l) SQLSetPos(s,r,SQL_POSITION,l)
-#define SQL_REFRESH_RECORD(s,i,f) SQLSetPos(s,r,SQL_REFRESH,fLock)
-#define SQL_UPDATE_RECORD(s,r) SQLSetPos(s,r,SQL_UPDATE,SQL_LOCK_NO_CHANGE)
-#define SQL_DELETE_RECORD(s,r) SQLSetPos(s,r,SQL_DELETE,SQL_LOCK_NO_CHANGE)
-#define SQL_ADD_RECORD(s,r) SQLSetPos(s,r,SQL_ADD,SQL_LOCK_NO_CHANGE)
-#define SQL_DRIVER_NOPROMPT 0
 #define SQL_DRIVER_COMPLETE 1
-#define SQL_DRIVER_PROMPT 2
 #define SQL_DRIVER_COMPLETE_REQUIRED 3
-#define SQL_FETCH_LAST 3
-#define SQL_FETCH_PRIOR 4
-#define SQL_FETCH_ABSOLUTE 5
-#define SQL_FETCH_RELATIVE 6
+#define SQL_DRIVER_HDBC 3
+#define SQL_DRIVER_HENV 4
+#define SQL_DRIVER_HLIB 76
+#define SQL_DRIVER_HSTMT 5
+#define SQL_DRIVER_NAME 6
+#define SQL_DRIVER_NOPROMPT 0
+#define SQL_DRIVER_ODBC_VER 77
+#define SQL_DRIVER_PROMPT 2
+#define SQL_DRIVER_VER 7
+#define SQL_DTC_ENLIST_EXPENSIVE 1
+#define SQL_DTC_TRANSITION_COST 1750
+#define SQL_DTC_UNENLIST_EXPENSIVE 2
+#define SQL_ENSURE 1
+#define SQL_ENTIRE_ROWSET 0
+#define SQL_EXPRESSIONS_IN_ORDERBY 27
+#define SQL_FD_FETCH_BOOKMARK 128
+#define SQL_FD_FETCH_PREV SQL_FD_FETCH_PRIOR /* deprecated */
+#define SQL_FD_FETCH_RESUME 64
 #define SQL_FETCH_BOOKMARK 8
-#define SQL_ROW_SUCCESS 0
-#define SQL_ROW_DELETED 1
-#define SQL_ROW_UPDATED 2
-#define SQL_ROW_NOROW 3
-#define SQL_ROW_ADDED 4
-#define SQL_ROW_ERROR 5
-#define SQL_CASCADE 0
-#define SQL_RESTRICT 1
-#define SQL_SET_NULL 2
-#define SQL_NO_ACTION 3
-#define SQL_SET_DEFAULT 4
-#define SQL_PARAM_TYPE_UNKNOWN 0
+#define SQL_FETCH_PREV SQL_FETCH_PRIOR /* deprecated */
+#define SQL_FETCH_RESUME 7 /* deprecated */
+#define SQL_FILE_CATALOG SQL_FILE_QUALIFIER
+#define SQL_FILE_NOT_SUPPORTED 0x0000
+#define SQL_FILE_QUALIFIER 0x0002
+#define SQL_FILE_TABLE 0x0001
+#define SQL_FILE_USAGE 84
+#define SQL_FN_CVT_CONVERT 0x00000001L
+#define SQL_FN_NUM_ABS 0x00000001L
+#define SQL_FN_NUM_ACOS 0x00000002L
+#define SQL_FN_NUM_ASIN 0x00000004L
+#define SQL_FN_NUM_ATAN 0x00000008L
+#define SQL_FN_NUM_ATAN2 0x00000010L
+#define SQL_FN_NUM_CEILING 0x00000020L
+#define SQL_FN_NUM_COS 0x00000040L
+#define SQL_FN_NUM_COT 0x00000080L
+#define SQL_FN_NUM_DEGREES 0x00040000L
+#define SQL_FN_NUM_EXP 0x00000100L
+#define SQL_FN_NUM_FLOOR 0x00000200L
+#define SQL_FN_NUM_LOG 0x00000400L
+#define SQL_FN_NUM_LOG10 0x00080000L
+#define SQL_FN_NUM_MOD 0x00000800L
+#define SQL_FN_NUM_PI 0x00010000L
+#define SQL_FN_NUM_POWER 0x00100000L
+#define SQL_FN_NUM_RADIANS 0x00200000L
+#define SQL_FN_NUM_RAND 0x00020000L
+#define SQL_FN_NUM_ROUND 0x00400000L
+#define SQL_FN_NUM_SIGN 0x00001000L
+#define SQL_FN_NUM_SIN 0x00002000L
+#define SQL_FN_NUM_SQRT 0x00004000L
+#define SQL_FN_NUM_TAN 0x00008000L
+#define SQL_FN_NUM_TRUNCATE 0x00800000L
+#define SQL_FN_STR_ASCII 0x00002000L
+#define SQL_FN_STR_CHAR 0x00004000L
+#define SQL_FN_STR_CONCAT 0x00000001L
+#define SQL_FN_STR_DIFFERENCE 0x00008000L
+#define SQL_FN_STR_INSERT 0x00000002L
+#define SQL_FN_STR_LCASE 0x00000040L
+#define SQL_FN_STR_LEFT 0x00000004L
+#define SQL_FN_STR_LENGTH 0x00000010L
+#define SQL_FN_STR_LOCATE 0x00000020L
+#define SQL_FN_STR_LOCATE_2 0x00010000L
+#define SQL_FN_STR_LTRIM 0x00000008L
+#define SQL_FN_STR_REPEAT 0x00000080L
+#define SQL_FN_STR_REPLACE 0x00000100L
+#define SQL_FN_STR_RIGHT 0x00000200L
+#define SQL_FN_STR_RTRIM 0x00000400L
+#define SQL_FN_STR_SOUNDEX 0x00020000L
+#define SQL_FN_STR_SPACE 0x00040000L
+#define SQL_FN_STR_SUBSTRING 0x00000800L
+#define SQL_FN_STR_UCASE 0x00001000L
+#define SQL_FN_SYS_DBNAME 0x00000002L
+#define SQL_FN_SYS_IFNULL 0x00000004L
+#define SQL_FN_SYS_USERNAME 0x00000001L
+#define SQL_FN_TD_CURDATE 0x00000002L
+#define SQL_FN_TD_CURTIME 0x00000200L
+#define SQL_FN_TD_DAYNAME 0x00008000L
+#define SQL_FN_TD_DAYOFMONTH 0x00000004L
+#define SQL_FN_TD_DAYOFWEEK 0x00000008L
+#define SQL_FN_TD_DAYOFYEAR 0x00000010L
+#define SQL_FN_TD_HOUR 0x00000400L
+#define SQL_FN_TD_MINUTE 0x00000800L
+#define SQL_FN_TD_MONTH 0x00000020L
+#define SQL_FN_TD_MONTHNAME 0x00010000L
+#define SQL_FN_TD_NOW 0x00000001L
+#define SQL_FN_TD_QUARTER 0x00000040L
+#define SQL_FN_TD_SECOND 0x00001000L
+#define SQL_FN_TD_TIMESTAMPADD 0x00002000L
+#define SQL_FN_TD_TIMESTAMPDIFF 0x00004000L
+#define SQL_FN_TD_WEEK 0x00000080L
+#define SQL_FN_TD_YEAR 0x00000100L
+#define SQL_FN_TSI_DAY 0x00000010L
+#define SQL_FN_TSI_FRAC_SECOND 0x00000001L
+#define SQL_FN_TSI_HOUR 0x00000008L
+#define SQL_FN_TSI_MINUTE 0x00000004L
+#define SQL_FN_TSI_MONTH 0x00000040L
+#define SQL_FN_TSI_QUARTER 0x00000080L
+#define SQL_FN_TSI_SECOND 0x00000002L
+#define SQL_FN_TSI_WEEK 0x00000020L
+#define SQL_FN_TSI_YEAR 0x00000100L
+#define SQL_GB_GROUP_BY_CONTAINS_SELECT 2
+#define SQL_GB_GROUP_BY_EQUALS_SELECT 1
+#define SQL_GB_NO_RELATION 3
+#define SQL_GB_NOT_SUPPORTED 0
+#define SQL_GD_BLOCK 4
+#define SQL_GD_BOUND 8
+#define SQL_GET_BOOKMARK 13
+#define SQL_GROUP_BY 88
+#define SQL_IGNORE (-6)
+#define SQL_INFO_FIRST 0
+#define SQL_KEYSET_SIZE 8
+#define SQL_KEYSET_SIZE_DEFAULT 0UL
+#define SQL_KEYWORDS 89
+#define SQL_LCK_EXCLUSIVE 2
+#define SQL_LCK_NO_CHANGE 1
+#define SQL_LCK_UNLOCK 4
+#define SQL_LEN_BINARY_ATTR(length) (-(length)+SQL_LEN_BINARY_ATTR_OFFSET)
+#define SQL_LEN_BINARY_ATTR_OFFSET (-100)
+#define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET)
+#define SQL_LEN_DATA_AT_EXEC_OFFSET (-100)
+#define SQL_LIKE_ESCAPE_CLAUSE 113
+#define SQL_LIKE_ONLY 1
+#define SQL_LOCK_EXCLUSIVE 1
+#define SQL_LOCK_NO_CHANGE 0
+#define SQL_LOCK_TYPES 78
+#define SQL_LOCK_UNLOCK 2
+#define SQL_LOGIN_TIMEOUT 103
+#define SQL_LOGIN_TIMEOUT_DEFAULT 15UL
+#define SQL_LONGVARBINARY (-4)
+#define SQL_LONGVARCHAR (-1)
+#define SQL_MAX_BINARY_LITERAL_LEN 112
+#define SQL_MAX_CHAR_LITERAL_LEN 108
+#define SQL_MAX_DSN_LENGTH 32
+#define SQL_MAX_LENGTH 3
+#define SQL_MAX_LENGTH_DEFAULT 0UL
+#define SQL_MAX_OPTION_STRING_LENGTH 256
+#define SQL_MAX_OWNER_NAME_LEN 32
+#define SQL_MAX_PROCEDURE_NAME_LEN 33
+#define SQL_MAX_QUALIFIER_NAME_LEN 34
+#define SQL_MAX_ROW_SIZE_INCLUDES_LONG 103
+#define SQL_MAX_ROWS 1
+#define SQL_MAX_ROWS_DEFAULT 0UL
+#define SQL_MODE_DEFAULT SQL_MODE_READ_WRITE
+#define SQL_MODE_READ_ONLY 1UL
+#define SQL_MODE_READ_WRITE 0UL
+#define SQL_MULT_RESULT_SETS 36
+#define SQL_MULTIPLE_ACTIVE_TXN 37
+#define SQL_NC_END 0x0004
+#define SQL_NC_START 0x0002
+#define SQL_NEED_LONG_DATA_LEN 111
+#define SQL_NNC_NON_NULL 0x0001
+#define SQL_NNC_NULL 0x0000
+#define SQL_NO_TOTAL (-4)
+#define SQL_NON_NULLABLE_COLUMNS 75
+#define SQL_NOSCAN 2
+#define SQL_NOSCAN_DEFAULT SQL_NOSCAN_OFF
+#define SQL_NOSCAN_OFF 0UL
+#define SQL_NOSCAN_ON 1UL
+#define SQL_NUMERIC_FUNCTIONS 49
+#define SQL_OAC_LEVEL1 0x0001
+#define SQL_OAC_LEVEL2 0x0002
+#define SQL_OAC_NONE 0x0000
+#define SQL_ODBC_API_CONFORMANCE 9
+#define SQL_ODBC_CURSORS 110
+#define SQL_ODBC_SAG_CLI_CONFORMANCE 12
+#define SQL_ODBC_SQL_CONFORMANCE 15
+#define SQL_ODBC_SQL_OPT_IEF 73
+#define SQL_ODBC_VER 10
+#define SQL_OPT_TRACE 104
+#define SQL_OPT_TRACE_DEFAULT SQL_OPT_TRACE_OFF
+#define SQL_OPT_TRACE_FILE_DEFAULT "\\SQL.LOG"
+#define SQL_OPT_TRACE_OFF 0UL
+#define SQL_OPT_TRACE_ON 1UL
+#define SQL_OPT_TRACEFILE 105
+#define SQL_OSC_CORE 1
+#define SQL_OSC_EXTENDED 2
+#define SQL_OSC_MINIMUM 0
+#define SQL_OSCC_COMPLIANT 1
+#define SQL_OSCC_NOT_COMPLIANT 0
+#define SQL_OU_DML_STATEMENTS 1
+#define SQL_OU_INDEX_DEFINITION 8
+#define SQL_OU_PRIVILEGE_DEFINITION 16
+#define SQL_OU_PROCEDURE_INVOCATION 2
+#define SQL_OU_TABLE_DEFINITION 4
+#define SQL_OUTER_JOINS 38
+#define SQL_OWNER_TERM 39
+#define SQL_OWNER_USAGE 91
+#define SQL_PACKET_SIZE 112
 #define SQL_PARAM_INPUT 1
 #define SQL_PARAM_INPUT_OUTPUT 2
-#define SQL_RESULT_COL 3
 #define SQL_PARAM_OUTPUT 4
-#define SQL_RETURN_VALUE 5
-#define SQL_PT_UNKNOWN 0
-#define SQL_PT_PROCEDURE 1
-#define SQL_PT_FUNCTION 2
 #define SQL_PARAM_TYPE_DEFAULT SQL_PARAM_INPUT_OUTPUT
+#define SQL_PARAM_TYPE_UNKNOWN 0
+#define SQL_PC_NOT_PSEUDO 1
+#define SQL_POS_ADD 16
+#define SQL_POS_DELETE 8
+#define SQL_POS_OPERATIONS 79
+#define SQL_POS_POSITION 1
+#define SQL_POS_REFRESH 2
+#define SQL_POS_UPDATE 4
+#define SQL_POSITION 0
+#define SQL_POSITIONED_STATEMENTS 80
+#define SQL_PRED_SEARCHABLE SQL_SEARCHABLE
+#define SQL_PROCEDURE_TERM 40
+#define SQL_PROCEDURES 21
+#define SQL_PS_POSITIONED_DELETE 1
+#define SQL_PS_POSITIONED_UPDATE 2
+#define SQL_PS_SELECT_FOR_UPDATE 4
+#define SQL_PT_FUNCTION 2
+#define SQL_PT_PROCEDURE 1
+#define SQL_PT_UNKNOWN 0
+#define SQL_QL_END 0x0002
+#define SQL_QL_START 0x0001
+#define SQL_QU_DML_STATEMENTS 1
+#define SQL_QU_INDEX_DEFINITION 8
+#define SQL_QU_PRIVILEGE_DEFINITION 16
+#define SQL_QU_PROCEDURE_INVOCATION 2
+#define SQL_QU_TABLE_DEFINITION 4
+#define SQL_QUALIFIER_LOCATION 114
+#define SQL_QUALIFIER_NAME_SEPARATOR 41
+#define SQL_QUALIFIER_TERM 42
+#define SQL_QUALIFIER_USAGE 92
+#define SQL_QUERY_TIMEOUT 0
+#define SQL_QUERY_TIMEOUT_DEFAULT 0UL
+#define SQL_QUICK 0
+#define SQL_QUIET_MODE 111
+#define SQL_QUOTED_IDENTIFIER_CASE 93
+#define SQL_RD_DEFAULT SQL_RD_ON
+#define SQL_RD_OFF 0UL
+#define SQL_RD_ON 1UL
+#define SQL_REFRESH 1
+#define SQL_RESTRICT 1
+#define SQL_RESULT_COL 3
+#define SQL_RETRIEVE_DATA 11
+#define SQL_RETURN_VALUE 5
+#define SQL_ROW_ADDED 4
+#define SQL_ROW_DELETED 1
+#define SQL_ROW_ERROR 5
+#define SQL_ROW_NOROW 3
+#define SQL_ROW_NUMBER 14
+#define SQL_ROW_SUCCESS 0
+#define SQL_ROW_UPDATED 2
+#define SQL_ROW_UPDATES 11
+#define SQL_ROWSET_SIZE 9
+#define SQL_ROWSET_SIZE_DEFAULT 1UL
+#define SQL_ROWVER 2
+#define SQL_SC_NON_UNIQUE 0UL
+#define SQL_SC_TRY_UNIQUE 1UL
+#define SQL_SC_UNIQUE 2UL
+#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER /* deprecated */ 
+#define SQL_SCROLL_DYNAMIC (-2L) /* deprecated */   
+#define SQL_SCROLL_FORWARD_ONLY 0L /* deprecated */   
+#define SQL_SCROLL_KEYSET_DRIVEN (-1L) /* deprecated */   
+#define SQL_SCROLL_OPTIONS 44
+#define SQL_SCROLL_STATIC (-3L) /* deprecated */   
+#define SQL_SEARCHABLE 3
+#define SQL_SET_NULL 2
 #define SQL_SETPARAM_VALUE_MAX (-1L)
+#define SQL_SETPOS_MAX_LOCK_VALUE SQL_LOCK_UNLOCK
+#define SQL_SETPOS_MAX_OPTION_VALUE SQL_ADD
+#define SQL_SIGNED_OFFSET (-20)
+#define SQL_SIMULATE_CURSOR 10
+#define SQL_SO_DYNAMIC 4
+#define SQL_SO_FORWARD_ONLY 1
+#define SQL_SO_KEYSET_DRIVEN 2
+#define SQL_SO_MIXED 8
+#define SQL_SO_STATIC 16
+#define SQL_SQ_COMPARISON 1
+#define SQL_SQ_CORRELATED_SUBQUERIES 16
+#define SQL_SQ_EXISTS 2
+#define SQL_SQ_IN 4
+#define SQL_SQ_QUANTIFIED 8
+#define SQL_SQLSTATE_SIZE 5
+#define SQL_SS_ADDITIONS 1
+#define SQL_SS_DELETIONS 2
+#define SQL_SS_UPDATES 4
+#define SQL_STATIC_SENSITIVITY 83
+#define SQL_STRING_FUNCTIONS 50
+#define SQL_SUBQUERIES 95
+#define SQL_SYSTEM_FUNCTIONS 51
+#define SQL_TABLE_STAT 0
+#define SQL_TABLE_TERM 45
+#define SQL_TIME 10
+#define SQL_TIMEDATE_ADD_INTERVALS 109
+#define SQL_TIMEDATE_DIFF_INTERVALS 110
+#define SQL_TIMEDATE_FUNCTIONS 52
+#define SQL_TIMESTAMP 11
+#define SQL_TINYINT (-6)
+#define SQL_TRANSLATE_DLL 106
+#define SQL_TRANSLATE_OPTION 107
+#define SQL_TXN_ISOLATION 108
+#define SQL_TXN_VERSIONING 16
+#define SQL_TYPE_NULL 0
+#define SQL_U_UNION 1
+#define SQL_U_UNION_ALL 2
+#define SQL_UB_DEFAULT SQL_UB_OFF
+#define SQL_UB_OFF 0UL
+#define SQL_UB_ON 01UL
+#define SQL_UNION 96
+#define SQL_UNSEARCHABLE 0
+#define SQL_UNSIGNED_OFFSET (-22)
+#define SQL_UPDATE 2 
+#define SQL_USE_BOOKMARKS 12
+#define SQL_VARBINARY (-3)
+#define SQL_POSITION_TO(s,r) SQLSetPos(s,r,SQL_POSITION,SQL_LOCK_NO_CHANGE)
+#define SQL_LOCK_RECORD(s,r,l) SQLSetPos(s,r,SQL_POSITION,l)
+#define SQL_REFRESH_RECORD(s,r,l) SQLSetPos(s,r,SQL_REFRESH,l)
+#define SQL_UPDATE_RECORD(s,r) SQLSetPos(s,r,SQL_UPDATE,SQL_LOCK_NO_CHANGE)
+#define SQL_DELETE_RECORD(s,r) SQLSetPos(s,r,SQL_DELETE,SQL_LOCK_NO_CHANGE)
+#define SQL_ADD_RECORD(s,r) SQLSetPos(s,r,SQL_ADD,SQL_LOCK_NO_CHANGE)
+
+#if (ODBCVER < 0x0300)
+#define SQL_CONNECT_OPT_DRVR_START 1000
+#define SQL_CONN_OPT_MAX SQL_PACKET_SIZE
+#define SQL_CONN_OPT_MIN SQL_ACCESS_MODE
+#define SQL_STMT_OPT_MAX SQL_ROW_NUMBER
+#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT
+#define SQL_TYPE_DRIVER_START SQL_INTERVAL_YEAR
+#define SQL_TYPE_DRIVER_END SQL_UNICODE_LONGVARCHAR
+#define SQL_TYPE_MIN SQL_BIT
+#define SQL_TYPE_MAX SQL_VARCHAR
+#endif
+
+#if (ODBCVER < 0x0300)
+#define SQL_NO_DATA_FOUND 100
+#define SQL_INTERVAL_YEAR (-80)
+#define SQL_INTERVAL_MONTH (-81)
+#define SQL_INTERVAL_YEAR_TO_MONTH (-82)
+#define SQL_INTERVAL_DAY (-83)
+#define SQL_INTERVAL_HOUR (-84)
+#define SQL_INTERVAL_MINUTE (-85)
+#define SQL_INTERVAL_SECOND (-86)
+#define SQL_INTERVAL_DAY_TO_HOUR (-87)
+#define SQL_INTERVAL_DAY_TO_MINUTE (-88)
+#define SQL_INTERVAL_DAY_TO_SECOND (-89)
+#define SQL_INTERVAL_HOUR_TO_MINUTE (-90)
+#define SQL_INTERVAL_HOUR_TO_SECOND (-91)
+#define SQL_INTERVAL_MINUTE_TO_SECOND (-92)
+#else  
 #define SQL_NO_DATA_FOUND SQL_NO_DATA
+#define SQL_CODE_YEAR 1
+#define SQL_CODE_MONTH 2
+#define SQL_CODE_DAY 3
+#define SQL_CODE_HOUR 4
+#define SQL_CODE_MINUTE 5
+#define SQL_CODE_SECOND 6
+#define SQL_CODE_YEAR_TO_MONTH 7
+#define SQL_CODE_DAY_TO_HOUR 8
+#define SQL_CODE_DAY_TO_MINUTE 9
+#define SQL_CODE_DAY_TO_SECOND 10
+#define SQL_CODE_HOUR_TO_MINUTE 11
+#define SQL_CODE_HOUR_TO_SECOND 12
+#define SQL_CODE_MINUTE_TO_SECOND 13
+#define SQL_INTERVAL_YEAR (100 + SQL_CODE_SECOND)
+#define SQL_INTERVAL_MONTH (100 + SQL_CODE_YEAR_TO_MONTH)
+#define SQL_INTERVAL_DAY (100 + SQL_CODE_DAY_TO_HOUR)
+#define SQL_INTERVAL_HOUR (100 + SQL_CODE_DAY_TO_MINUTE)
+#define SQL_INTERVAL_MINUTE (100 + SQL_CODE_DAY_TO_SECOND)
+#define SQL_INTERVAL_SECOND (100 + SQL_CODE_HOUR_TO_MINUTE)
+#define SQL_INTERVAL_YEAR_TO_MONTH (100 + SQL_CODE_HOUR_TO_SECOND)  
+#define SQL_INTERVAL_DAY_TO_HOUR (100 + SQL_CODE_MINUTE_TO_SECOND)
+#define SQL_INTERVAL_DAY_TO_MINUTE (100 + SQL_CODE_DAY_TO_MINUTE)
+#define SQL_INTERVAL_DAY_TO_SECOND (100 + SQL_CODE_DAY_TO_SECOND)
+#define SQL_INTERVAL_HOUR_TO_MINUTE (100 + SQL_CODE_HOUR_TO_MINUTE)
+#define SQL_INTERVAL_HOUR_TO_SECOND (100 + SQL_CODE_HOUR_TO_SECOND)
+#define SQL_INTERVAL_MINUTE_TO_SECOND (100 + SQL_CODE_MINUTE_TO_SECOND)
+#endif
+
+#if (ODBCVER <= 0x0300)
+#define SQL_UNICODE (-95)
+#define SQL_UNICODE_VARCHAR (-96)
+#define SQL_UNICODE_LONGVARCHAR (-97)
+#define SQL_UNICODE_CHAR SQL_UNICODE
+#else
+#define SQL_UNICODE SQL_WCHAR
+#define SQL_UNICODE_VARCHAR SQL_WVARCHAR
+#define SQL_UNICODE_LONGVARCHAR SQL_WLONGVARCHAR
+#define SQL_UNICODE_CHAR SQL_WCHAR
+#endif
+
+#if (ODBCVER >= 0x0201) && (ODBCVER < 0x0300) 
+#define SQL_OJ_CAPABILITIES 65003  
+#endif /* ODBCVER < 0x0300 */
+
+#if (ODBCVER >= 0x0250)
+#define SQL_NO_ACTION 3
+#define SQL_SET_DEFAULT 4
+#endif /* ODBCVER >= 0x0250 */
+
+#if (ODBCVER >= 0x0300)
+#define SQL_ACTIVE_ENVIRONMENTS 116
+#define SQL_AD_ADD_CONSTRAINT_DEFERRABLE 0x00000080L
+#define SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
+#define SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
+#define SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE 0x00000100L
+#define SQL_AD_ADD_DOMAIN_CONSTRAINT 0x00000002L
+#define SQL_AD_ADD_DOMAIN_DEFAULT 0x00000008L
+#define SQL_AD_CONSTRAINT_NAME_DEFINITION 0x00000001L
+#define SQL_AD_DROP_DOMAIN_CONSTRAINT 0x00000004L
+#define SQL_AD_DROP_DOMAIN_DEFAULT 0x00000010L
+#define SQL_AF_ALL 0x00000040L
+#define SQL_AF_AVG 0x00000001L
+#define SQL_AF_COUNT 0x00000002L
+#define SQL_AF_DISTINCT 0x00000020L
+#define SQL_AF_MAX 0x00000004L
+#define SQL_AF_MIN 0x00000008L
+#define SQL_AF_SUM 0x00000010L
+#define SQL_AGGREGATE_FUNCTIONS 169
+#define SQL_ALL_CATALOGS "%"
+#define SQL_ALL_SCHEMAS "%"
+#define SQL_ALL_TABLE_TYPES "%"
+#define SQL_ALTER_DOMAIN 117
+#define SQL_AM_CONNECTION 1
+#define SQL_AM_NONE 0
+#define SQL_AM_STATEMENT 2
+#define SQL_API_ODBC3_ALL_FUNCTIONS 999
+#define SQL_API_ODBC3_ALL_FUNCTIONS_SIZE 250
+#define SQL_API_SQLALLOCHANDLESTD 73
+#define SQL_API_SQLBULKOPERATIONS 24
+#define SQL_ASYNC_MODE 10021
+#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L
+#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L
+#define SQL_AT_ADD_COLUMN_SINGLE 0x00000020L
+#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L
+#define SQL_AT_CONSTRAINT_DEFERRABLE 0x00040000L
+#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L
+#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L
+#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L
+#define SQL_AT_CONSTRAINT_NON_DEFERRABLE 0x00080000L
+#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L
+#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L
+#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L
+#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L
+#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L
+#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L
+#define SQL_ATTR_ACCESS_MODE SQL_ACCESS_MODE
+#define SQL_ATTR_ASYNC_ENABLE 4
+#define SQL_ATTR_AUTOCOMMIT SQL_AUTOCOMMIT
+#define SQL_ATTR_CONCURRENCY SQL_CONCURRENCY
+#define SQL_ATTR_CONNECTION_POOLING 201
+#define SQL_ATTR_CONNECTION_TIMEOUT 113
+#define SQL_ATTR_CP_MATCH 202
+#define SQL_ATTR_CURRENT_CATALOG SQL_CURRENT_QUALIFIER
+#define SQL_ATTR_CURSOR_TYPE SQL_CURSOR_TYPE
+#define SQL_ATTR_DISCONNECT_BEHAVIOR 114
+#define SQL_ATTR_ENABLE_AUTO_IPD 15
+#define SQL_ATTR_ENLIST_IN_DTC 1207
+#define SQL_ATTR_ENLIST_IN_XA 1208
+#define SQL_ATTR_FETCH_BOOKMARK_PTR 16
+#define SQL_ATTR_KEYSET_SIZE SQL_KEYSET_SIZE
+#define SQL_ATTR_LOGIN_TIMEOUT SQL_LOGIN_TIMEOUT
+#define SQL_ATTR_MAX_LENGTH SQL_MAX_LENGTH
+#define SQL_ATTR_MAX_ROWS SQL_MAX_ROWS
+#define SQL_ATTR_NOSCAN SQL_NOSCAN
+#define SQL_ATTR_ODBC_CURSORS SQL_ODBC_CURSORS
+#define SQL_ATTR_ODBC_VERSION 200
+#define SQL_ATTR_PACKET_SIZE SQL_PACKET_SIZE
+#define SQL_ATTR_PARAM_BIND_OFFSET_PTR 17
+#define SQL_ATTR_PARAM_BIND_TYPE 18
+#define SQL_ATTR_PARAM_OPERATION_PTR 19
+#define SQL_ATTR_PARAM_STATUS_PTR 20
+#define SQL_ATTR_PARAMS_PROCESSED_PTR 21
+#define SQL_ATTR_PARAMSET_SIZE 22
+#define SQL_ATTR_QUERY_TIMEOUT SQL_QUERY_TIMEOUT
+#define SQL_ATTR_QUIET_MODE SQL_QUIET_MODE
+#define SQL_ATTR_RETRIEVE_DATA SQL_RETRIEVE_DATA
+#define SQL_ATTR_ROW_ARRAY_SIZE 27
+#define SQL_ATTR_ROW_BIND_OFFSET_PTR 23
+#define SQL_ATTR_ROW_BIND_TYPE SQL_BIND_TYPE
+#define SQL_ATTR_ROW_NUMBER SQL_ROW_NUMBER
+#define SQL_ATTR_ROW_OPERATION_PTR 24
+#define SQL_ATTR_ROW_STATUS_PTR 25
+#define SQL_ATTR_ROWS_FETCHED_PTR 26
+#define SQL_ATTR_SIMULATE_CURSOR SQL_SIMULATE_CURSOR
+#define SQL_ATTR_TRACE SQL_OPT_TRACE
+#define SQL_ATTR_TRACEFILE SQL_OPT_TRACEFILE
+#define SQL_ATTR_TRANSLATE_LIB SQL_TRANSLATE_DLL
+#define SQL_ATTR_TRANSLATE_OPTION SQL_TRANSLATE_OPTION
+#define SQL_ATTR_TXN_ISOLATION SQL_TXN_ISOLATION
+#define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS
+#define SQL_BATCH_ROW_COUNT 120
+#define SQL_BATCH_SUPPORT 121
+#define SQL_BRC_EXPLICIT 0x0000002
+#define SQL_BRC_PROCEDURES 0x0000001
+#define SQL_BRC_ROLLED_UP 0x0000004
+#define SQL_BS_ROW_COUNT_EXPLICIT 0x00000002L
+#define SQL_BS_ROW_COUNT_PROC 0x00000008L
+#define SQL_BS_SELECT_EXPLICIT 0x00000001L
+#define SQL_BS_SELECT_PROC 0x00000004L
+#define SQL_C_INTERVAL_DAY SQL_INTERVAL_DAY
+#define SQL_C_INTERVAL_DAY_TO_HOUR SQL_INTERVAL_DAY_TO_HOUR
+#define SQL_C_INTERVAL_DAY_TO_MINUTE SQL_INTERVAL_DAY_TO_MINUTE
+#define SQL_C_INTERVAL_DAY_TO_SECOND SQL_INTERVAL_DAY_TO_SECOND
+#define SQL_C_INTERVAL_HOUR SQL_INTERVAL_HOUR
+#define SQL_C_INTERVAL_HOUR_TO_MINUTE SQL_INTERVAL_HOUR_TO_MINUTE
+#define SQL_C_INTERVAL_HOUR_TO_SECOND SQL_INTERVAL_HOUR_TO_SECOND
+#define SQL_C_INTERVAL_MINUTE SQL_INTERVAL_MINUTE
+#define SQL_C_INTERVAL_MINUTE_TO_SECOND SQL_INTERVAL_MINUTE_TO_SECOND
+#define SQL_C_INTERVAL_MONTH SQL_INTERVAL_MONTH
+#define SQL_C_INTERVAL_SECOND SQL_INTERVAL_SECOND
+#define SQL_C_INTERVAL_YEAR SQL_INTERVAL_YEAR
+#define SQL_C_INTERVAL_YEAR_TO_MONTH SQL_INTERVAL_YEAR_TO_MONTH
+#define SQL_C_NUMERIC SQL_NUMERIC
+#define SQL_C_SBIGINT (SQL_BIGINT+SQL_SIGNED_OFFSET)
+#define SQL_C_TYPE_DATE SQL_TYPE_DATE
+#define SQL_C_TYPE_TIME SQL_TYPE_TIME
+#define SQL_C_TYPE_TIMESTAMP SQL_TYPE_TIMESTAMP
+#define SQL_C_UBIGINT (SQL_BIGINT+SQL_UNSIGNED_OFFSET)
+#define SQL_C_VARBOOKMARK SQL_C_BINARY
+#define SQL_CA_CONSTRAINT_DEFERRABLE 0x00000040L
+#define SQL_CA_CONSTRAINT_INITIALLY_DEFERRED 0x00000010L
+#define SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000020L
+#define SQL_CA_CONSTRAINT_NON_DEFERRABLE 0x00000080L
+#define SQL_CA_CREATE_ASSERTION 0x00000001L
+#define SQL_CA1_ABSOLUTE 0x00000002L
+#define SQL_CA1_BOOKMARK 0x00000008L
+#define SQL_CA1_BULK_ADD 0x00010000L
+#define SQL_CA1_BULK_DELETE_BY_BOOKMARK 0x00040000L
+#define SQL_CA1_BULK_FETCH_BY_BOOKMARK 0x00080000L
+#define SQL_CA1_BULK_UPDATE_BY_BOOKMARK 0x00020000L
+#define SQL_CA1_LOCK_EXCLUSIVE 0x00000080L
+#define SQL_CA1_LOCK_NO_CHANGE 0x00000040L
+#define SQL_CA1_LOCK_UNLOCK 0x00000100L
+#define SQL_CA1_NEXT 0x00000001L
+#define SQL_CA1_POS_DELETE 0x00000800L
+#define SQL_CA1_POS_POSITION 0x00000200L
+#define SQL_CA1_POS_REFRESH 0x00001000L
+#define SQL_CA1_POS_UPDATE 0x00000400L
+#define SQL_CA1_POSITIONED_DELETE 0x00004000L
+#define SQL_CA1_POSITIONED_UPDATE 0x00002000L
+#define SQL_CA1_RELATIVE 0x00000004L
+#define SQL_CA1_SELECT_FOR_UPDATE 0x00008000L
+#define SQL_CA2_CRC_APPROXIMATE 0x00002000L
+#define SQL_CA2_CRC_EXACT 0x00001000L
+#define SQL_CA2_LOCK_CONCURRENCY 0x00000002L
+#define SQL_CA2_MAX_ROWS_AFFECTS_ALL (SQL_CA2_MAX_ROWS_SELECT | SQL_CA2_MAX_ROWS_INSERT | \
+    SQL_CA2_MAX_ROWS_DELETE | SQL_CA2_MAX_ROWS_UPDATE | SQL_CA2_MAX_ROWS_CATALOG)
+#define SQL_CA2_MAX_ROWS_CATALOG 0x00000800L
+#define SQL_CA2_MAX_ROWS_DELETE 0x00000200L
+#define SQL_CA2_MAX_ROWS_INSERT 0x00000100L
+#define SQL_CA2_MAX_ROWS_SELECT 0x00000080L
+#define SQL_CA2_MAX_ROWS_UPDATE 0x00000400L
+#define SQL_CA2_OPT_ROWVER_CONCURRENCY 0x00000004L
+#define SQL_CA2_OPT_VALUES_CONCURRENCY 0x00000008L
+#define SQL_CA2_READ_ONLY_CONCURRENCY 0x00000001L
+#define SQL_CA2_SENSITIVITY_ADDITIONS 0x00000010L
+#define SQL_CA2_SENSITIVITY_DELETIONS 0x00000020L
+#define SQL_CA2_SENSITIVITY_UPDATES 0x00000040L
+#define SQL_CA2_SIMULATE_NON_UNIQUE 0x00004000L
+#define SQL_CA2_SIMULATE_TRY_UNIQUE 0x00008000L
+#define SQL_CA2_SIMULATE_UNIQUE 0x00010000L
+#define SQL_CATALOG_LOCATION SQL_QUALIFIER_LOCATION
+#define SQL_CATALOG_NAME_SEPARATOR SQL_QUALIFIER_NAME_SEPARATOR
+#define SQL_CATALOG_TERM SQL_QUALIFIER_TERM
+#define SQL_CATALOG_USAGE SQL_QUALIFIER_USAGE
+#define SQL_CCOL_CREATE_COLLATION 0x00000001L
+#define SQL_CCS_COLLATE_CLAUSE 0x00000002L
+#define SQL_CCS_CREATE_CHARACTER_SET 0x00000001L
+#define SQL_CCS_LIMITED_COLLATION 0x00000004L
+#define SQL_CDO_COLLATION 0x00000008L
+#define SQL_CDO_CONSTRAINT 0x00000004L
+#define SQL_CDO_CONSTRAINT_DEFERRABLE 0x00000080L
+#define SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
+#define SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
+#define SQL_CDO_CONSTRAINT_NAME_DEFINITION 0x00000010L
+#define SQL_CDO_CONSTRAINT_NON_DEFERRABLE 0x00000100L
+#define SQL_CDO_CREATE_DOMAIN 0x00000001L
+#define SQL_CDO_DEFAULT 0x00000002L
+#define SQL_CL_END SQL_QL_END
+#define SQL_CL_START SQL_QL_START
+#define SQL_COL_PRED_BASIC SQL_ALL_EXCEPT_LIKE
+#define SQL_COL_PRED_CHAR SQL_LIKE_ONLY
+#define SQL_COLUMN_DRIVER_START 1000
+#define SQL_COLUMN_IGNORE SQL_IGNORE
+#define SQL_COLUMN_NUMBER_UNKNOWN (-2)
+#define SQL_CONVERT_GUID 173
+#define SQL_CONVERT_INTERVAL_DAY_TIME 123
+#define SQL_CONVERT_INTERVAL_YEAR_MONTH 124
+#define SQL_CONVERT_WCHAR 122
+#define SQL_CONVERT_WLONGVARCHAR 125
+#define SQL_CONVERT_WVARCHAR 126
+#define SQL_CP_DEFAULT SQL_CP_OFF
+#define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH
+#define SQL_CP_OFF 0UL
+#define SQL_CP_ONE_PER_DRIVER 1UL
+#define SQL_CP_ONE_PER_HENV 2UL
+#define SQL_CP_RELAXED_MATCH 1UL
+#define SQL_CP_STRICT_MATCH 0UL
+#define SQL_CREATE_ASSERTION 127
+#define SQL_CREATE_CHARACTER_SET 128
+#define SQL_CREATE_COLLATION 129
+#define SQL_CREATE_DOMAIN 130
+#define SQL_CREATE_SCHEMA 131
+#define SQL_CREATE_TABLE 132
+#define SQL_CREATE_TRANSLATION 133
+#define SQL_CREATE_VIEW 134
+#define SQL_CS_AUTHORIZATION 0x00000002L
+#define SQL_CS_CREATE_SCHEMA 0x00000001L
+#define SQL_CS_DEFAULT_CHARACTER_SET 0x00000004L
+#define SQL_CT_COLUMN_COLLATION 0x00000800L
+#define SQL_CT_COLUMN_CONSTRAINT 0x00000200L
+#define SQL_CT_COLUMN_DEFAULT 0x00000400L
+#define SQL_CT_COMMIT_DELETE 0x00000004L
+#define SQL_CT_COMMIT_PRESERVE 0x00000002L
+#define SQL_CT_CONSTRAINT_DEFERRABLE 0x00000080L
+#define SQL_CT_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
+#define SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
+#define SQL_CT_CONSTRAINT_NAME_DEFINITION 0x00002000L
+#define SQL_CT_CONSTRAINT_NON_DEFERRABLE 0x00000100L
+#define SQL_CT_CREATE_TABLE 0x00000001L
+#define SQL_CT_GLOBAL_TEMPORARY 0x00000008L
+#define SQL_CT_LOCAL_TEMPORARY 0x00000010L
+#define SQL_CT_TABLE_CONSTRAINT 0x00001000L
+#define SQL_CTR_CREATE_TRANSLATION 0x00000001L
+#define SQL_CU_DML_STATEMENTS SQL_QU_DML_STATEMENTS
+#define SQL_CU_INDEX_DEFINITION SQL_QU_INDEX_DEFINITION
+#define SQL_CU_PRIVILEGE_DEFINITION SQL_QU_PRIVILEGE_DEFINITION
+#define SQL_CU_PROCEDURE_INVOCATION SQL_QU_PROCEDURE_INVOCATION
+#define SQL_CU_TABLE_DEFINITION SQL_QU_TABLE_DEFINITION
+#define	SQL_CVT_GUID 0x1000000L
+#define SQL_CVT_INTERVAL_DAY_TIME 0x00100000L
+#define SQL_CVT_INTERVAL_YEAR_MONTH 0x00080000L
+#define SQL_CVT_WCHAR 0x00200000L
+#define SQL_CVT_WLONGVARCHAR 0x00400000L
+#define SQL_CVT_WVARCHAR 0x00800000L
+#define SQL_DA_DROP_ASSERTION 0x00000001L
+#define SQL_DATETIME_LITERALS 119
+#define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL
+#define SQL_DB_DISCONNECT 1UL
+#define SQL_DB_RETURN_TO_POOL 0UL
+#define SQL_DC_DROP_COLLATION 0x00000001L
+#define SQL_DCS_DROP_CHARACTER_SET 0x00000001L
+#define SQL_DD_CASCADE 0x00000004L
+#define SQL_DD_DROP_DOMAIN 0x00000001L
+#define SQL_DD_RESTRICT 0x00000002L
+#define SQL_DDL_INDEX 170
+#define SQL_DELETE_BY_BOOKMARK 6
+#define SQL_DESC_ARRAY_SIZE 20
+#define SQL_DESC_ARRAY_STATUS_PTR 21
+#define SQL_DESC_AUTO_UNIQUE_VALUE SQL_COLUMN_AUTO_INCREMENT
+#define SQL_DESC_BASE_COLUMN_NAME 22
+#define SQL_DESC_BASE_TABLE_NAME 23
+#define SQL_DESC_BIND_OFFSET_PTR 24
+#define SQL_DESC_BIND_TYPE 25
+#define SQL_DESC_CASE_SENSITIVE SQL_COLUMN_CASE_SENSITIVE
+#define SQL_DESC_CATALOG_NAME SQL_COLUMN_QUALIFIER_NAME
+#define SQL_DESC_CONCISE_TYPE SQL_COLUMN_TYPE
+#define SQL_DESC_DATETIME_INTERVAL_PRECISION 26
+#define SQL_DESC_DISPLAY_SIZE SQL_COLUMN_DISPLAY_SIZE
+#define SQL_DESC_FIXED_PREC_SCALE SQL_COLUMN_MONEY
+#define SQL_DESC_LABEL SQL_COLUMN_LABEL
+#define SQL_DESC_LITERAL_PREFIX 27
+#define SQL_DESC_LITERAL_SUFFIX 28
+#define SQL_DESC_LOCAL_TYPE_NAME 29
+#define SQL_DESC_MAXIMUM_SCALE 30
+#define SQL_DESC_MINIMUM_SCALE 31
+#define SQL_DESC_NUM_PREC_RADIX 32
+#define SQL_DESC_PARAMETER_TYPE 33
+#define SQL_DESC_ROWS_PROCESSED_PTR 34
+#define SQL_DESC_SCHEMA_NAME SQL_COLUMN_OWNER_NAME
+#define SQL_DESC_SEARCHABLE SQL_COLUMN_SEARCHABLE
+#define SQL_DESC_TABLE_NAME SQL_COLUMN_TABLE_NAME
+#define SQL_DESC_TYPE_NAME SQL_COLUMN_TYPE_NAME
+#define SQL_DESC_UNSIGNED SQL_COLUMN_UNSIGNED
+#define SQL_DESC_UPDATABLE SQL_COLUMN_UPDATABLE
+#define SQL_DI_CREATE_INDEX 0x00000001L
+#define SQL_DI_DROP_INDEX 0x00000002L
+#define SQL_DIAG_COLUMN_NUMBER (-1247)
+#define SQL_DIAG_CURSOR_ROW_COUNT (-1249)
+#define SQL_DIAG_ROW_NUMBER (-1248)
+#define SQL_DL_SQL92_DATE 0x00000001L
+#define SQL_DL_SQL92_INTERVAL_DAY 0x00000020L
+#define SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR 0x00000400L
+#define SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE 0x00000800L
+#define SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND 0x00001000L
+#define SQL_DL_SQL92_INTERVAL_HOUR 0x00000040L
+#define SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE 0x00002000L
+#define SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND 0x00004000L
+#define SQL_DL_SQL92_INTERVAL_MINUTE 0x00000080L
+#define SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND 0x00008000L
+#define SQL_DL_SQL92_INTERVAL_MONTH 0x00000010L
+#define SQL_DL_SQL92_INTERVAL_SECOND 0x00000100L
+#define SQL_DL_SQL92_INTERVAL_YEAR 0x00000008L
+#define SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH 0x00000200L
+#define SQL_DL_SQL92_TIME 0x00000002L
+#define SQL_DL_SQL92_TIMESTAMP 0x00000004L
+#define SQL_DM_VER 171
+#define SQL_DRIVER_HDESC 135
+#define SQL_DROP_ASSERTION 136
+#define SQL_DROP_CHARACTER_SET 137
+#define SQL_DROP_COLLATION 138
+#define SQL_DROP_DOMAIN 139
+#define SQL_DROP_SCHEMA 140
+#define SQL_DROP_TABLE 141
+#define SQL_DROP_TRANSLATION 142
+#define SQL_DROP_VIEW 143
+#define SQL_DS_CASCADE 0x00000004L
+#define SQL_DS_DROP_SCHEMA 0x00000001L
+#define SQL_DS_RESTRICT 0x00000002L
+#define SQL_DT_CASCADE 0x00000004L
+#define SQL_DT_DROP_TABLE 0x00000001L
+#define SQL_DT_RESTRICT 0x00000002L
+#define SQL_DTC_DONE 0L
+#define SQL_DTR_DROP_TRANSLATION 0x00000001L
+#define SQL_DV_CASCADE 0x00000004L
+#define SQL_DV_DROP_VIEW 0x00000001L
+#define SQL_DV_RESTRICT 0x00000002L
+#define SQL_DYNAMIC_CURSOR_ATTRIBUTES1 144
+#define SQL_DYNAMIC_CURSOR_ATTRIBUTES2 145
+#define SQL_EXT_API_LAST SQL_API_SQLBINDPARAMETER
+#define SQL_EXT_API_START 40
+#define SQL_FETCH_BY_BOOKMARK 7
+#define SQL_FETCH_FIRST_SYSTEM 32
+#define SQL_FETCH_FIRST_USER 31  
+#define SQL_FN_CVT_CAST 0x00000002L
+#define SQL_FN_STR_BIT_LENGTH 0x00080000L
+#define SQL_FN_STR_CHAR_LENGTH 0x00100000L
+#define SQL_FN_STR_CHARACTER_LENGTH 0x00200000L
+#define SQL_FN_STR_OCTET_LENGTH 0x00400000L
+#define SQL_FN_STR_POSITION 0x00800000L
+#define SQL_FN_TD_CURRENT_DATE 0x00020000L
+#define SQL_FN_TD_CURRENT_TIME 0x00040000L
+#define SQL_FN_TD_CURRENT_TIMESTAMP 0x00080000L
+#define SQL_FN_TD_EXTRACT 0x00100000L
+#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1 146
+#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 147
+#define SQL_FUNC_EXISTS(exists, api) \
+   ((*(((UWORD*) (exists)) + ((api) >> 4)) & (1 << ((api) & 15)) ) ? \
+   SQL_TRUE : SQL_FALSE )
+#define SQL_GB_COLLATE 0x0004
+#define SQL_HANDLE_SENV 5
+#define SQL_IK_ALL (SQL_IK_ASC | SQL_IK_DESC)
+#define SQL_IK_ASC 1
+#define SQL_IK_DESC 2
+#define SQL_IK_NONE 0
+#define SQL_INDEX_KEYWORDS 148
+#define SQL_INFO_DRIVER_START 1000
+#define SQL_INFO_LAST SQL_QUALIFIER_LOCATION
+#define SQL_INFO_SCHEMA_VIEWS 149
+#define SQL_INITIALLY_DEFERRED 5
+#define SQL_INITIALLY_IMMEDIATE 6
+#define SQL_INSERT_STATEMENT 172
+#define SQL_INTERVAL 10
+#define SQL_IS_INSERT_LITERALS 0x00000001L
+#define SQL_IS_INSERT_SEARCHED 0x00000002L
+#define SQL_IS_INTEGER (-6)
+#define SQL_IS_POINTER (-4)
+#define SQL_IS_SELECT_INTO 0x00000004L
+#define SQL_IS_SMALLINT (-8)
+#define SQL_IS_UINTEGER (-5)
+#define SQL_IS_USMALLINT (-7)
+#define SQL_ISV_ASSERTIONS 0x00000001L
+#define SQL_ISV_CHARACTER_SETS 0x00000002L
+#define SQL_ISV_CHECK_CONSTRAINTS 0x00000004L
+#define SQL_ISV_COLLATIONS 0x00000008L
+#define SQL_ISV_COLUMN_DOMAIN_USAGE 0x00000010L
+#define SQL_ISV_COLUMN_PRIVILEGES 0x00000020L
+#define SQL_ISV_COLUMNS 0x00000040L
+#define SQL_ISV_CONSTRAINT_COLUMN_USAGE 0x00000080L
+#define SQL_ISV_CONSTRAINT_TABLE_USAGE 0x00000100L
+#define SQL_ISV_DOMAIN_CONSTRAINTS 0x00000200L
+#define SQL_ISV_DOMAINS 0x00000400L
+#define SQL_ISV_KEY_COLUMN_USAGE 0x00000800L
+#define SQL_ISV_REFERENTIAL_CONSTRAINTS 0x00001000L
+#define SQL_ISV_SCHEMATA 0x00002000L
+#define SQL_ISV_SQL_LANGUAGES 0x00004000L
+#define SQL_ISV_TABLE_CONSTRAINTS 0x00008000L
+#define SQL_ISV_TABLE_PRIVILEGES 0x00010000L
+#define SQL_ISV_TABLES 0x00020000L
+#define SQL_ISV_TRANSLATIONS 0x00040000L
+#define SQL_ISV_USAGE_PRIVILEGES 0x00080000L
+#define SQL_ISV_VIEW_COLUMN_USAGE 0x00100000L
+#define SQL_ISV_VIEW_TABLE_USAGE 0x00200000L
+#define SQL_ISV_VIEWS 0x00400000L
+#define SQL_KEYSET_CURSOR_ATTRIBUTES1 150
+#define SQL_KEYSET_CURSOR_ATTRIBUTES2 151
+#define SQL_MAX_ASYNC_CONCURRENT_STATEMENTS 10022
+#define SQL_NO_COLUMN_NUMBER (-1)
+#define SQL_NO_ROW_NUMBER (-1)
+#define SQL_NOT_DEFERRABLE 7
+#define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST-SQL_EXT_API_START+1)
+#define SQL_NUM_FUNCTIONS 23
+#define SQL_ODBC_INTERFACE_CONFORMANCE 152
+#define SQL_OIC_CORE 1UL
+#define SQL_OIC_LEVEL1 2UL
+#define SQL_OIC_LEVEL2 3UL
+#define SQL_OV_ODBC2 2UL
+#define SQL_OV_ODBC3 3UL
+#define SQL_PARAM_ARRAY_ROW_COUNTS 153
+#define SQL_PARAM_ARRAY_SELECTS 154
+#define SQL_PARAM_BIND_BY_COLUMN 0UL
+#define SQL_PARAM_BIND_TYPE_DEFAULT SQL_PARAM_BIND_BY_COLUMN
+#define SQL_PARAM_DIAG_UNAVAILABLE 1
+#define SQL_PARAM_ERROR 5
+#define SQL_PARAM_IGNORE 1
+#define SQL_PARAM_PROCEED 0
+#define SQL_PARAM_SUCCESS 0
+#define SQL_PARAM_SUCCESS_WITH_INFO 6
+#define SQL_PARAM_UNUSED 7
+#define SQL_PARC_BATCH 1
+#define SQL_PARC_NO_BATCH 2
+#define SQL_PAS_BATCH 1
+#define SQL_PAS_NO_BATCH 2
+#define SQL_PAS_NO_SELECT 3
+#define SQL_ROW_IGNORE 1
+#define SQL_ROW_NUMBER_UNKNOWN (-2)
+#define SQL_ROW_PROCEED 0
+#define SQL_ROW_SUCCESS_WITH_INFO 6
+#define SQL_SC_FIPS127_2_TRANSITIONAL 0x00000002L
+#define SQL_SC_SQL92_ENTRY 0x00000001L
+#define SQL_SC_SQL92_FULL 0x00000008L
+#define SQL_SC_SQL92_INTERMEDIATE 0x00000004L
+#define SQL_SCC_ISO92_CLI 0x00000002L
+#define SQL_SCC_XOPEN_CLI_VERSION1 0x00000001L
+#define SQL_SCHEMA_TERM SQL_OWNER_TERM
+#define SQL_SCHEMA_USAGE SQL_OWNER_USAGE
+#define SQL_SDF_CURRENT_DATE 0x00000001L
+#define SQL_SDF_CURRENT_TIME 0x00000002L
+#define SQL_SDF_CURRENT_TIMESTAMP 0x00000004L
+#define SQL_SFKD_CASCADE 0x00000001L
+#define SQL_SFKD_NO_ACTION 0x00000002L
+#define SQL_SFKD_SET_DEFAULT 0x00000004L
+#define SQL_SFKD_SET_NULL 0x00000008L
+#define SQL_SFKU_CASCADE 0x00000001L
+#define SQL_SFKU_NO_ACTION 0x00000002L
+#define SQL_SFKU_SET_DEFAULT 0x00000004L
+#define SQL_SFKU_SET_NULL 0x00000008L
+#define SQL_SG_DELETE_TABLE 0x00000020L
+#define SQL_SG_INSERT_COLUMN 0x00000080L
+#define SQL_SG_INSERT_TABLE 0x00000040L
+#define SQL_SG_REFERENCES_COLUMN 0x00000200L
+#define SQL_SG_REFERENCES_TABLE 0x00000100L
+#define SQL_SG_SELECT_TABLE 0x00000400L
+#define SQL_SG_UPDATE_COLUMN 0x00001000L
+#define SQL_SG_UPDATE_TABLE 0x00000800L
+#define SQL_SG_USAGE_ON_CHARACTER_SET 0x00000002L
+#define SQL_SG_USAGE_ON_COLLATION 0x00000004L
+#define SQL_SG_USAGE_ON_DOMAIN 0x00000001L
+#define SQL_SG_USAGE_ON_TRANSLATION 0x00000008L
+#define SQL_SG_WITH_GRANT_OPTION 0x00000010L
+#define SQL_SNVF_BIT_LENGTH 0x00000001L
+#define SQL_SNVF_CHAR_LENGTH 0x00000002L
+#define SQL_SNVF_CHARACTER_LENGTH 0x00000004L
+#define SQL_SNVF_EXTRACT 0x00000008L
+#define SQL_SNVF_OCTET_LENGTH 0x00000010L
+#define SQL_SNVF_POSITION 0x00000020L
+#define SQL_SP_BETWEEN 0x00000800L
+#define SQL_SP_COMPARISON 0x00001000L
+#define SQL_SP_EXISTS 0x00000001L
+#define SQL_SP_IN 0x00000400L
+#define SQL_SP_ISNOTNULL 0x00000002L
+#define SQL_SP_ISNULL 0x00000004L
+#define SQL_SP_LIKE 0x00000200L
+#define SQL_SP_MATCH_FULL 0x00000008L
+#define SQL_SP_MATCH_PARTIAL 0x00000010L
+#define SQL_SP_MATCH_UNIQUE_FULL 0x00000020L
+#define SQL_SP_MATCH_UNIQUE_PARTIAL 0x00000040L
+#define SQL_SP_OVERLAPS 0x00000080L
+#define SQL_SP_QUANTIFIED_COMPARISON 0x00002000L
+#define SQL_SP_UNIQUE 0x00000100L
+#define SQL_SQL_CONFORMANCE 118
+#define SQL_SQL92_DATETIME_FUNCTIONS 155
+#define SQL_SQL92_FOREIGN_KEY_DELETE_RULE 156
+#define SQL_SQL92_FOREIGN_KEY_UPDATE_RULE 157
+#define SQL_SQL92_GRANT 158
+#define SQL_SQL92_NUMERIC_VALUE_FUNCTIONS 159
+#define SQL_SQL92_PREDICATES 160
+#define SQL_SQL92_RELATIONAL_JOIN_OPERATORS 161
+#define SQL_SQL92_REVOKE 162
+#define SQL_SQL92_ROW_VALUE_CONSTRUCTOR 163
+#define SQL_SQL92_STRING_FUNCTIONS 164
+#define SQL_SQL92_VALUE_EXPRESSIONS 165
+#define SQL_SR_CASCADE 0x00000020L
+#define SQL_SR_DELETE_TABLE 0x00000080L
+#define SQL_SR_GRANT_OPTION_FOR 0x00000010L
+#define SQL_SR_INSERT_COLUMN 0x00000200L
+#define SQL_SR_INSERT_TABLE 0x00000100L
+#define SQL_SR_REFERENCES_COLUMN 0x00000800L
+#define SQL_SR_REFERENCES_TABLE 0x00000400L
+#define SQL_SR_RESTRICT 0x00000040L
+#define SQL_SR_SELECT_TABLE 0x00001000L
+#define SQL_SR_UPDATE_COLUMN 0x00004000L
+#define SQL_SR_UPDATE_TABLE 0x00002000L
+#define SQL_SR_USAGE_ON_CHARACTER_SET 0x00000002L
+#define SQL_SR_USAGE_ON_COLLATION 0x00000004L
+#define SQL_SR_USAGE_ON_DOMAIN 0x00000001L
+#define SQL_SR_USAGE_ON_TRANSLATION 0x00000008L
+#define SQL_SRJO_CORRESPONDING_CLAUSE 0x00000001L
+#define SQL_SRJO_CROSS_JOIN 0x00000002L
+#define SQL_SRJO_EXCEPT_JOIN 0x00000004L
+#define SQL_SRJO_FULL_OUTER_JOIN 0x00000008L
+#define SQL_SRJO_INNER_JOIN 0x00000010L
+#define SQL_SRJO_INTERSECT_JOIN 0x00000020L
+#define SQL_SRJO_LEFT_OUTER_JOIN 0x00000040L
+#define SQL_SRJO_NATURAL_JOIN 0x00000080L
+#define SQL_SRJO_RIGHT_OUTER_JOIN 0x00000100L
+#define SQL_SRJO_UNION_JOIN 0x00000200L
+#define SQL_SRVC_DEFAULT 0x00000004L
+#define SQL_SRVC_NULL 0x00000002L
+#define SQL_SRVC_ROW_SUBQUERY 0x00000008L
+#define SQL_SRVC_VALUE_EXPRESSION 0x00000001L
+#define SQL_SSF_CONVERT 0x00000001L
+#define SQL_SSF_LOWER 0x00000002L
+#define SQL_SSF_SUBSTRING 0x00000008L
+#define SQL_SSF_TRANSLATE 0x00000010L
+#define SQL_SSF_TRIM_BOTH 0x00000020L
+#define SQL_SSF_TRIM_LEADING 0x00000040L
+#define SQL_SSF_TRIM_TRAILING 0x00000080L
+#define SQL_SSF_UPPER 0x00000004L
+#define SQL_STANDARD_CLI_CONFORMANCE 166
+#define SQL_STATIC_CURSOR_ATTRIBUTES1 167
+#define SQL_STATIC_CURSOR_ATTRIBUTES2 168
+#define SQL_SU_DML_STATEMENTS SQL_OU_DML_STATEMENTS
+#define SQL_SU_INDEX_DEFINITION SQL_OU_INDEX_DEFINITION
+#define SQL_SU_PRIVILEGE_DEFINITION SQL_OU_PRIVILEGE_DEFINITION
+#define SQL_SU_PROCEDURE_INVOCATION SQL_OU_PROCEDURE_INVOCATION
+#define SQL_SU_TABLE_DEFINITION SQL_OU_TABLE_DEFINITION
+#define SQL_SVE_CASE 0x00000001L
+#define SQL_SVE_CAST 0x00000002L
+#define SQL_SVE_COALESCE 0x00000004L
+#define SQL_SVE_NULLIF 0x00000008L
+#define SQL_UB_FIXED SQL_UB_ON
+#define SQL_UB_VARIABLE 2UL
+#define SQL_UNION_STATEMENT SQL_UNION
+#define SQL_UPDATE_BY_BOOKMARK 5
+#define SQL_US_UNION SQL_U_UNION
+#define SQL_US_UNION_ALL SQL_U_UNION_ALL
+#endif /* ODBCVER >= 0x300 */
+#if (ODBCVER >= 0x0350)
+#define SQL_DESC_ROWVER 35
+#define SQL_GUID (-11)
+#define SQL_C_GUID SQL_GUID
+#ifdef ODBC_STD
+#define SQLAllocHandle SQLAllocHandleStd
+#define SQLAllocEnv(p) SQLAllocHandleStd(SQL_HANDLE_ENV,SQL_NULL_HANDLE,p)
+#define SQL_YEAR SQL_CODE_YEAR
+#define SQL_MONTH SQL_CODE_MONTH
+#define SQL_DAY SQL_CODE_DAY
+#define SQL_HOUR SQL_CODE_HOUR
+#define SQL_MINUTE SQL_CODE_MINUTE
+#define SQL_SECOND SQL_CODE_SECOND
+#define SQL_YEAR_TO_MONTH SQL_CODE_YEAR_TO_MONTH
+#define SQL_DAY_TO_HOUR SQL_CODE_DAY_TO_HOUR
+#define SQL_DAY_TO_MINUTE SQL_CODE_DAY_TO_MINUTE
+#define SQL_DAY_TO_SECOND SQL_CODE_DAY_TO_SECOND
+#define SQL_HOUR_TO_MINUTE SQL_CODE_HOUR_TO_MINUTE
+#define SQL_HOUR_TO_SECOND SQL_CODE_HOUR_TO_SECOND
+#define SQL_MINUTE_TO_SECOND SQL_CODE_MINUTE_TO_SECOND
+#endif /* ODBC_STD */
+#endif /* ODBCVER >= 0x0350 */
+#if (ODBCVER >= 0x0351)
+#define SQL_ATTR_ANSI_APP 115
+#define SQL_AA_TRUE 1L
+#define SQL_AA_FALSE 0L
+#endif
+
+#define	TRACE_VERSION 1000
+#define TRACE_ON 1
+
+#ifndef RC_INVOKED
+#define SQL_ODBC_KEYWORDS \
+"ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
+"ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
+"BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
+"CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
+"COLLATE,COLLATION,COLUMN,COMMIT,CONNECT,CONNECTION,CONSTRAINT,"\
+"CONSTRAINTS,CONTINUE,CONVERT,CORRESPONDING,COUNT,CREATE,CROSS,CURRENT,"\
+"CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,"\
+"DATE,DAY,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFERRABLE,"\
+"DEFERRED,DELETE,DESC,DESCRIBE,DESCRIPTOR,DIAGNOSTICS,DISCONNECT,"\
+"DISTINCT,DOMAIN,DOUBLE,DROP,"\
+"ELSE,END,END-EXEC,ESCAPE,EXCEPT,EXCEPTION,EXEC,EXECUTE,"\
+"EXISTS,EXTERNAL,EXTRACT,"\
+"FALSE,FETCH,FIRST,FLOAT,FOR,FOREIGN,FORTRAN,FOUND,FROM,FULL,"\
+"GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR,"\
+"IDENTITY,IMMEDIATE,IN,INCLUDE,INDEX,INDICATOR,INITIALLY,INNER,"\
+"INPUT,INSENSITIVE,INSERT,INT,INTEGER,INTERSECT,INTERVAL,INTO,IS,ISOLATION,"\
+"JOIN,KEY,LANGUAGE,LAST,LEADING,LEFT,LEVEL,LIKE,LOCAL,LOWER,"\
+"MATCH,MAX,MIN,MINUTE,MODULE,MONTH,"\
+"NAMES,NATIONAL,NATURAL,NCHAR,NEXT,NO,NONE,NOT,NULL,NULLIF,NUMERIC,"\
+"OCTET_LENGTH,OF,ON,ONLY,OPEN,OPTION,OR,ORDER,OUTER,OUTPUT,OVERLAPS,"\
+"PAD,PARTIAL,PASCAL,PLI,POSITION,PRECISION,PREPARE,PRESERVE,"\
+"PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,"\
+"READ,REAL,REFERENCES,RELATIVE,RESTRICT,REVOKE,RIGHT,ROLLBACK,ROWS"\
+"SCHEMA,SCROLL,SECOND,SECTION,SELECT,SESSION,SESSION_USER,SET,SIZE,"\
+"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\
+"SUBSTRING,SUM,SYSTEM_USER,"\
+"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\
+"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\
+"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
+"VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,WRITE,"\
+"YEAR,ZONE"
 
 SQLRETURN SQL_API SQLDriverConnect(SQLHDBC,SQLHWND,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLUSMALLINT);
 SQLRETURN SQL_API SQLBrowseConnect(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
 SQLRETURN SQL_API SQLColumnPrivileges(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLDescribeParam(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT*,SQLUINTEGER*,SQLSMALLINT*,SQLSMALLINT*);
+SQLRETURN SQL_API SQLColAttributes(SQLHSTMT,SQLUSMALLINT, SQLUSMALLINT, SQLPOINTER, SQLSMALLINT, SQLSMALLINT*, SQLLEN*);
+SQLRETURN SQL_API SQLDescribeParam(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*);
 SQLRETURN SQL_API SQLExtendedFetch(SQLHSTMT,SQLUSMALLINT,SQLINTEGER,SQLUINTEGER*,SQLUSMALLINT*);
 SQLRETURN SQL_API SQLForeignKeys(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
 SQLRETURN SQL_API SQLMoreResults(SQLHSTMT);
@@ -72,7 +1194,20 @@ SQLRETURN SQL_API SQLProcedures(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLI
 SQLRETURN SQL_API SQLSetPos(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLUSMALLINT);
 SQLRETURN SQL_API SQLTablePrivileges(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
 SQLRETURN SQL_API SQLDrivers(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLBindParameter(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLUINTEGER,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
+SQLRETURN SQL_API SQLBindParameter(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*);
+SQLRETURN SQL_API SQLSetScrollOptions(SQLHSTMT,SQLUSMALLINT,SQLLEN,SQLUSMALLINT); /* deprecated */
+DWORD SQL_API ODBCGetTryWaitValue(void);
+BOOL SQL_API ODBCSetTryWaitValue(DWORD);
+RETCODE	SQL_API TraceOpenLogFile(LPWSTR,LPWSTR,DWORD);
+RETCODE	SQL_API TraceCloseLogFile(void);
+VOID SQL_API TraceReturn(RETCODE,RETCODE);
+DWORD SQL_API TraceVersion(void);
+#if (ODBCVER >= 0x0300)
+SQLRETURN SQL_API SQLBulkOperations(SQLHSTMT,SQLSMALLINT);
+SQLRETURN SQL_API SQLAllocHandleStd( SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
+#endif
+#endif /* ndef RC_INVOKED */
+#include <sqlucode.h>
 #ifdef __cplusplus
 }
 #endif
diff --git a/winsup/w32api/include/sqltypes.h b/winsup/w32api/include/sqltypes.h
index 4d9529d9d..c2f1bfa50 100644
--- a/winsup/w32api/include/sqltypes.h
+++ b/winsup/w32api/include/sqltypes.h
@@ -4,14 +4,16 @@
 extern "C" {
 #endif
 #define SQL_API __stdcall
-#pragma pack(push,1)
+#ifndef RC_INVOKED
+#define __need_wchar_t
+#include <stddef.h>
 typedef signed char SCHAR;
 typedef long SDWORD;
 typedef short SWORD;
 typedef ULONG UDWORD;
 typedef USHORT UWORD;
-typedef long SLONG;
-typedef short SSHORT;
+typedef signed long SLONG;
+typedef signed short SSHORT;
 typedef double SDOUBLE;
 typedef double LDOUBLE;
 typedef float SFLOAT;
@@ -24,15 +26,61 @@ typedef UCHAR SQLCHAR;
 typedef SCHAR SQLSCHAR;
 typedef SDWORD SQLINTEGER;
 typedef SWORD SQLSMALLINT;
+#ifndef __WIN64
 typedef UDWORD SQLUINTEGER;
+#endif
 typedef UWORD SQLUSMALLINT;
 typedef PVOID SQLPOINTER;
-typedef HENV SQLHENV;
-typedef HDBC SQLHDBC;
-typedef HSTMT SQLHSTMT;
+#if (ODBCVER >= 0x0300)
+typedef void* SQLHANDLE;
+typedef SQLHANDLE SQLHENV;
+typedef SQLHANDLE SQLHDBC;
+typedef SQLHANDLE SQLHSTMT;
+typedef SQLHANDLE SQLHDESC;
+#else
+typedef void* SQLHENV;
+typedef void* SQLHDBC;
+typedef void* SQLHSTMT;
+#endif
 typedef SQLSMALLINT SQLRETURN;
 typedef HWND SQLHWND;
 typedef ULONG BOOKMARK;
+#ifdef _WIN64
+typedef INT64 SQLLEN;
+typedef INT64 SQLROWOFFSET;
+typedef UINT64 SQLROWCOUNT;
+typedef UINT64 SQLULEN;
+typedef UINT64 SQLTRANSID;
+typedef unsigned long SQLSETPOSIROW;
+#else
+#define SQLLEN SQLINTEGER
+#define SQLROWOFFSET SQLINTEGER
+#define SQLROWCOUNT SQLUINTEGER
+#define SQLULEN SQLUINTEGER
+#define SQLTRANSID DWORD
+#define SQLSETPOSIROW SQLUSMALLINT
+#endif
+typedef wchar_t SQLWCHAR;
+#ifdef UNICODE
+typedef SQLWCHAR        SQLTCHAR;
+#else
+typedef SQLCHAR         SQLTCHAR;
+#endif  /* UNICODE */
+#if (ODBCVER >= 0x0300)
+typedef unsigned char   SQLDATE;
+typedef unsigned char   SQLDECIMAL;
+typedef double          SQLDOUBLE;
+typedef double          SQLFLOAT;
+typedef unsigned char   SQLNUMERIC;
+typedef float           SQLREAL;
+typedef unsigned char   SQLTIME;
+typedef unsigned char   SQLTIMESTAMP;
+typedef unsigned char   SQLVARCHAR;
+#define ODBCINT64	__int64
+typedef __int64 SQLBIGINT;
+typedef unsigned __int64 SQLUBIGINT;
+#endif
+
 typedef struct tagDATE_STRUCT {
 	SQLSMALLINT year;
 	SQLUSMALLINT month;
@@ -52,9 +100,56 @@ typedef struct tagTIMESTAMP_STRUCT {
 	SQLUSMALLINT second;
 	SQLUINTEGER fraction;
 } TIMESTAMP_STRUCT;
-typedef void* SQLHANDLE; 
-typedef SQLHANDLE SQLHDESC; 
-#pragma pack(pop)
+#if (ODBCVER >= 0x0300)
+typedef DATE_STRUCT	SQL_DATE_STRUCT;
+typedef TIME_STRUCT	SQL_TIME_STRUCT;
+typedef TIMESTAMP_STRUCT SQL_TIMESTAMP_STRUCT;
+typedef enum {
+	SQL_IS_YEAR = 1,SQL_IS_MONTH,SQL_IS_DAY,SQL_IS_HOUR,
+	SQL_IS_MINUTE,SQL_IS_SECOND,SQL_IS_YEAR_TO_MONTH,SQL_IS_DAY_TO_HOUR,
+	SQL_IS_DAY_TO_MINUTE,SQL_IS_DAY_TO_SECOND,SQL_IS_HOUR_TO_MINUTE,
+	SQL_IS_HOUR_TO_SECOND,SQL_IS_MINUTE_TO_SECOND
+} SQLINTERVAL;
+typedef struct tagSQL_YEAR_MONTH {
+	SQLUINTEGER year;
+	SQLUINTEGER month;
+} SQL_YEAR_MONTH_STRUCT;
+typedef struct tagSQL_DAY_SECOND {
+	SQLUINTEGER day;
+	SQLUINTEGER	hour;
+	SQLUINTEGER minute;
+	SQLUINTEGER second;
+	SQLUINTEGER fraction;
+} SQL_DAY_SECOND_STRUCT;
+typedef struct tagSQL_INTERVAL_STRUCT {
+	SQLINTERVAL interval_type;
+	SQLSMALLINT interval_sign;
+	union {
+		SQL_YEAR_MONTH_STRUCT year_month;
+		SQL_DAY_SECOND_STRUCT day_second;
+	} intval;
+} SQL_INTERVAL_STRUCT;
+#define SQL_MAX_NUMERIC_LEN 16
+typedef struct tagSQL_NUMERIC_STRUCT {
+	SQLCHAR precision;
+	SQLSCHAR scale;
+	SQLCHAR sign;
+	SQLCHAR val[SQL_MAX_NUMERIC_LEN];
+} SQL_NUMERIC_STRUCT;
+#endif  /* ODBCVER >= 0x0300 */
+#if (ODBCVER >= 0x0350)
+#ifdef _GUID_DEFINED
+typedef GUID SQLGUID;
+#else
+typedef struct tagSQLGUID{
+    DWORD Data1;
+    WORD Data2;
+    WORD Data3;
+    BYTE Data4[ 8 ];
+} SQLGUID;
+#endif  /* _GUID_DEFINED */
+#endif  /* ODBCVER >= 0x0350 */
+#endif     /* RC_INVOKED */
 #ifdef __cplusplus
 }
 #endif
diff --git a/winsup/w32api/lib/odbc32.def b/winsup/w32api/lib/odbc32.def
index e10adc823..d9205174c 100644
--- a/winsup/w32api/lib/odbc32.def
+++ b/winsup/w32api/lib/odbc32.def
@@ -1,62 +1,185 @@
-LIBRARY ODBC32.DLL
+LIBRARY ODBC32.dll
 EXPORTS
-ConnectDlg@16
-PostError@20
+CloseODBCPerfData@0
+CollectODBCPerfData@16
+CursorLibLockDbc@8
+CursorLibLockDesc@8
+CursorLibLockStmt@8
+CursorLibTransact@12
+LockHandle@12
+MpHeapAlloc
+MpHeapCompact
+MpHeapCreate
+MpHeapDestroy
+MpHeapFree
+MpHeapReAlloc
+MpHeapSize
+MpHeapValidate
+ODBCGetTryWaitValue@0
+ODBCInternalConnectW@36
+ODBCQualifyFileDSNW@4
+ODBCSetTryWaitValue@4
+ODBCSharedPerfMon
+ODBCSharedTraceFlag
+ODBCSharedVSFlag
+OpenODBCPerfData@4
+PostComponentError@4
+PostODBCComponentError@4
 PostODBCError@16
 SQLAllocConnect@8
 SQLAllocEnv@4
+SQLAllocHandle@12
+SQLAllocHandleStd@12
 SQLAllocStmt@8
 SQLBindCol@24
+SQLBindParam@32
 SQLBindParameter@40
 SQLBrowseConnect@24
+SQLBrowseConnectA@24
+SQLBrowseConnectW@24
+SQLBulkOperations@8
 SQLCancel@4
+SQLCloseCursor@4
+SQLColAttribute@28
+SQLColAttributeA@28
+SQLColAttributeW@28
 SQLColAttributes@28
+SQLColAttributesA@28
+SQLColAttributesW@28
 SQLColumnPrivileges@36
+SQLColumnPrivilegesA@36
+SQLColumnPrivilegesW@36
 SQLColumns@36
+SQLColumnsA@36
+SQLColumnsW@36
 SQLConnect@28
+SQLConnectA@28
+SQLConnectW@28
+SQLCopyDesc@8
 SQLDataSources@32
+SQLDataSourcesA@32
+SQLDataSourcesW@32
 SQLDescribeCol@36
+SQLDescribeColA@36
+SQLDescribeColW@36
 SQLDescribeParam@24
 SQLDisconnect@4
 SQLDriverConnect@32
+SQLDriverConnectA@32
+SQLDriverConnectW@32
 SQLDrivers@32
+SQLDriversA@32
+SQLDriversW@32
+SQLEndTran@12
 SQLError@32
+SQLErrorA@32
+SQLErrorW@32
 SQLExecDirect@12
+SQLExecDirectA@12
+SQLExecDirectW@12
 SQLExecute@4
 SQLExtendedFetch@20
 SQLFetch@4
+SQLFetchScroll@12
 SQLForeignKeys@52
+SQLForeignKeysA@52
+SQLForeignKeysW@52
 SQLFreeConnect@4
 SQLFreeEnv@4
 SQLFreeHandle@8
 SQLFreeStmt@8
+SQLGetConnectAttr@20
+SQLGetConnectAttrA@20
+SQLGetConnectAttrW@20
 SQLGetConnectOption@12
+SQLGetConnectOptionA@12
+SQLGetConnectOptionW@12
 SQLGetCursorName@16
+SQLGetCursorNameA@16
+SQLGetCursorNameW@16
 SQLGetData@24
+SQLGetDescField@24
+SQLGetDescFieldA@24
+SQLGetDescFieldW@24
+SQLGetDescRec@44
+SQLGetDescRecA@44
+SQLGetDescRecW@44
+SQLGetDiagField@28
+SQLGetDiagFieldA@28
+SQLGetDiagFieldW@28
+SQLGetDiagRec@32
+SQLGetDiagRecA@32
+SQLGetDiagRecW@32
+SQLGetEnvAttr@20
 SQLGetFunctions@12
 SQLGetInfo@20
+SQLGetInfoA@20
+SQLGetInfoW@20
+SQLGetStmtAttr@20
+SQLGetStmtAttrA@20
+SQLGetStmtAttrW@20
 SQLGetStmtOption@12
 SQLGetTypeInfo@8
+SQLGetTypeInfoA@8
+SQLGetTypeInfoW@8
 SQLMoreResults@4
 SQLNativeSql@24
+SQLNativeSqlA@24
+SQLNativeSqlW@24
 SQLNumParams@8
 SQLNumResultCols@8
 SQLParamData@8
 SQLParamOptions@12
 SQLPrepare@12
+SQLPrepareA@12
+SQLPrepareW@12
 SQLPrimaryKeys@28
+SQLPrimaryKeysA@28
+SQLPrimaryKeysW@28
 SQLProcedureColumns@36
+SQLProcedureColumnsA@36
+SQLProcedureColumnsW@36
 SQLProcedures@28
+SQLProceduresA@28
+SQLProceduresW@28
 SQLPutData@12
 SQLRowCount@8
+SQLSetConnectAttr@16
+SQLSetConnectAttrA@16
+SQLSetConnectAttrW@16
 SQLSetConnectOption@12
+SQLSetConnectOptionA@12
+SQLSetConnectOptionW@12
 SQLSetCursorName@12
+SQLSetCursorNameA@12
+SQLSetCursorNameW@12
+SQLSetDescField@20
+SQLSetDescFieldA@20
+SQLSetDescFieldW@20
+SQLSetDescRec@40
+SQLSetEnvAttr@16
 SQLSetParam@32
 SQLSetPos@16
 SQLSetScrollOptions@16
+SQLSetStmtAttr@16
+SQLSetStmtAttrA@16
+SQLSetStmtAttrW@16
 SQLSetStmtOption@12
 SQLSpecialColumns@40
+SQLSpecialColumnsA@40
+SQLSpecialColumnsW@40
 SQLStatistics@36
+SQLStatisticsA@36
+SQLStatisticsW@36
 SQLTablePrivileges@28
+SQLTablePrivilegesA@28
+SQLTablePrivilegesW@28
 SQLTables@36
+SQLTablesA@36
+SQLTablesW@36
 SQLTransact@12
+SearchStatusCode@8
+VFreeErrors@4
+VRetrieveDriverErrorsRowCol@24
+ValidateErrorQueue@8
+g_hHeapMalloc