Couldn't find wdiff. Falling back to builtin diff colouring... unixODBC: headers diff between 2.3.0 and 2.3.1 versions
 sql.h   sql.h 
skipping to change at line 608 skipping to change at line 608
#if (ODBCVER >= 0x0380) #if (ODBCVER >= 0x0380)
SQLRETURN SQL_API SQLCancelHandle(SQLSMALLINT HandleType, SQLHANDLE InputH andle); SQLRETURN SQL_API SQLCancelHandle(SQLSMALLINT HandleType, SQLHANDLE InputH andle);
#endif #endif
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT StatementHandle); SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT StatementHandle);
SQLRETURN SQL_API SQLColAttribute(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLColAttribute(SQLHSTMT StatementHandle,
SQLUSMALLINT ColumnNumber, SQLUSMAL LINT FieldIdentifier, SQLUSMALLINT ColumnNumber, SQLUSMAL LINT FieldIdentifier,
SQLPOINTER CharacterAttribute, SQLS MALLINT BufferLength, SQLPOINTER CharacterAttribute, SQLS MALLINT BufferLength,
SQLSMALLINT *StringLength, SQLLEN * NumericAttribute SQLSMALLINT *StringLength, SQLLEN * NumericAttribute );
/* spec says (SQLPOINTER) not (SQLEN*) - PAH */ );
/* Ms now say SQLLEN* http://msdn.microsoft.com/library/en-us/odbc/htm/ dasdkodbcoverview_64bit.asp - NG */ /* spec says (SQLPOINTER) not (SQLEN*) - PAH */
/* Ms now say SQLLEN*
http://msdn.microsoft.com/librar y/en-us/odbc/htm/dasdkodbcoverview_64bit.asp - NG */
#endif #endif
SQLRETURN SQL_API SQLColumns(SQLHSTMT StatementHandle, SQLRETURN SQL_API SQLColumns(SQLHSTMT StatementHandle,
SQLCHAR *CatalogName, SQLSMALLINT NameLen gth1, SQLCHAR *CatalogName, SQLSMALLINT NameLen gth1,
SQLCHAR *SchemaName, SQLSMALLINT NameLeng th2, SQLCHAR *SchemaName, SQLSMALLINT NameLeng th2,
SQLCHAR *TableName, SQLSMALLINT NameLengt h3, SQLCHAR *TableName, SQLSMALLINT NameLengt h3,
SQLCHAR *ColumnName, SQLSMALLINT NameLeng th4); SQLCHAR *ColumnName, SQLSMALLINT NameLeng th4);
SQLRETURN SQL_API SQLConnect(SQLHDBC ConnectionHandle, SQLRETURN SQL_API SQLConnect(SQLHDBC ConnectionHandle,
 End of changes. 1 change blocks. 
3 lines changed or deleted 5 lines changed or added


 sqlext.h   sqlext.h 
skipping to change at line 192 skipping to change at line 192
#define SQL_AUTOCOMMIT_ON 1UL #define SQL_AUTOCOMMIT_ON 1UL
#define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON #define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON
/* SQL_LOGIN_TIMEOUT options */ /* SQL_LOGIN_TIMEOUT options */
#define SQL_LOGIN_TIMEOUT_DEFAULT 15UL #define SQL_LOGIN_TIMEOUT_DEFAULT 15UL
/* SQL_OPT_TRACE options */ /* SQL_OPT_TRACE options */
#define SQL_OPT_TRACE_OFF 0UL #define SQL_OPT_TRACE_OFF 0UL
#define SQL_OPT_TRACE_ON 1UL #define SQL_OPT_TRACE_ON 1UL
#define SQL_OPT_TRACE_DEFAULT SQL_OPT_TRACE_OFF #define SQL_OPT_TRACE_DEFAULT SQL_OPT_TRACE_OFF
#ifdef _WINDOWS_
#define SQL_OPT_TRACE_FILE_DEFAULT "\\temp\\SQL.LOG"
#else
#define SQL_OPT_TRACE_FILE_DEFAULT "/tmp/SQL.LOG" #define SQL_OPT_TRACE_FILE_DEFAULT "/tmp/SQL.LOG"
#endif
/* SQL_ODBC_CURSORS options */ /* SQL_ODBC_CURSORS options */
#define SQL_CUR_USE_IF_NEEDED 0UL #define SQL_CUR_USE_IF_NEEDED 0UL
#define SQL_CUR_USE_ODBC 1UL #define SQL_CUR_USE_ODBC 1UL
#define SQL_CUR_USE_DRIVER 2UL #define SQL_CUR_USE_DRIVER 2UL
#define SQL_CUR_DEFAULT SQL_CUR_USE_DRIVER #define SQL_CUR_DEFAULT SQL_CUR_USE_DRIVER
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
/* values for SQL_ATTR_DISCONNECT_BEHAVIOR */ /* values for SQL_ATTR_DISCONNECT_BEHAVIOR */
#define SQL_DB_RETURN_TO_POOL 0UL #define SQL_DB_RETURN_TO_POOL 0UL
skipping to change at line 2111 skipping to change at line 2115
*/ */
/*@{*/ /*@{*/
#define TRACE_VERSION 1000 /*!< Ver sion of trace API */ #define TRACE_VERSION 1000 /*!< Ver sion of trace API */
#ifdef UNICODE #ifdef UNICODE
RETCODE TraceOpenLogFile(SQLPOINTER,LPWSTR,LPWSTR,DWORD); /*!< open a trace log file */ RETCODE TraceOpenLogFile(SQLPOINTER,LPWSTR,LPWSTR,DWORD); /*!< open a trace log file */
#else #else
RETCODE TraceOpenLogFile(SQLPOINTER,LPSTR,LPSTR,DWORD); /*!< open a trace log file */ RETCODE TraceOpenLogFile(SQLPOINTER,LPSTR,LPSTR,DWORD); /*!< open a trace log file */
#endif #endif
RETCODE TraceCloseLogFile(SQLPOINTER); /*!< Request to close a trace log */ RETCODE TraceCloseLogFile(SQLPOINTER); /*!< Request to close a trace log */
SQLRETURN TraceReturn(SQLPOINTER,SQLRETURN); /*!< Call to pr oduce trace output upon function return. */ SQLRETURN TraceReturn(SQLPOINTER,SQLRETURN); /*!< Call to pr oduce trace output upon function return. */
#ifdef __cplusplus DWORD TraceVersion(void); /*!< Returns trace API version */
DWORD TraceVersion(); /*!< Returns trace API version */
#else
DWORD TraceVersion(VOID); /*!< Returns trace API version */
#endif
/* Functions for Visual Studio Analyzer*/ /* Functions for Visual Studio Analyzer*/
/* to turn on/off tracing or VS events, call TraceVSControl by setting or c learing the following bits */ /* to turn on/off tracing or VS events, call TraceVSControl by setting or c learing the following bits */
#define TRACE_ON 0x00000001L #define TRACE_ON 0x00000001L
#define TRACE_VS_EVENT_ON 0x00000002L #define TRACE_VS_EVENT_ON 0x00000002L
RETCODE TraceVSControl(DWORD); RETCODE TraceVSControl(DWORD);
/* the flags in ODBC_VS_ARGS */ /* the flags in ODBC_VS_ARGS */
#define ODBC_VS_FLAG_UNICODE_ARG 0x00000001L /* the argument is u nicode */ #define ODBC_VS_FLAG_UNICODE_ARG 0x00000001L /* the argument is u nicode */
skipping to change at line 2148 skipping to change at line 2148
WCHAR *wszArg; WCHAR *wszArg;
CHAR *szArg; CHAR *szArg;
}u1; }u1;
union { union {
WCHAR *wszCorrelation; WCHAR *wszCorrelation;
CHAR *szCorrelation; CHAR *szCorrelation;
}u2; }u2;
RETCODE RetCode; RETCODE RetCode;
} ODBC_VS_ARGS, *PODBC_VS_ARGS; } ODBC_VS_ARGS, *PODBC_VS_ARGS;
VOID FireVSDebugEvent(PODBC_VS_ARGS); void FireVSDebugEvent(PODBC_VS_ARGS);
/*@}*/ /*@}*/
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
/* /*
* connection pooling retry times * connection pooling retry times
*/ */
BOOL ODBCSetTryWaitValue ( DWORD dwValue ); BOOL ODBCSetTryWaitValue ( DWORD dwValue );
#ifdef __cplusplus #ifdef __cplusplus
DWORD ODBCGetTryWaitValue ( ); DWORD ODBCGetTryWaitValue ( );
#else #else
DWORD ODBCGetTryWaitValue ( VOID ); DWORD ODBCGetTryWaitValue ( void );
#endif #endif
#ifndef __SQLUCODE_H #ifndef __SQLUCODE_H
#include "sqlucode.h" #include "sqlucode.h"
#endif #endif
#endif #endif
 End of changes. 5 change blocks. 
7 lines changed or deleted 7 lines changed or added


 sqltypes.h   sqltypes.h 
skipping to change at line 72 skipping to change at line 72
#ifndef ALLREADY_HAVE_WINDOWS_TYPE #ifndef ALLREADY_HAVE_WINDOWS_TYPE
#define FAR #define FAR
#define CALLBACK #define CALLBACK
#ifdef __OS2__ #ifdef __OS2__
#define SQL_API _System #define SQL_API _System
#else #else
#define SQL_API #define SQL_API
#endif #endif
#define BOOL int #define BOOL int
#ifndef _WINDOWS_
typedef void* HWND; typedef void* HWND;
#endif
typedef char CHAR; typedef char CHAR;
#ifdef UNICODE #ifdef UNICODE
/* /*
* NOTE: The Microsoft unicode define is only for apps that want to use TCH ARs and * NOTE: The Microsoft unicode define is only for apps that want to use TCH ARs and
* be able to compile for both unicode and non-unicode with the same sourc e. * be able to compile for both unicode and non-unicode with the same sourc e.
* This is not recommanded for linux applications and is not supported * This is not recommanded for linux applications and is not supported
* by the standard linux string header files. * by the standard linux string header files.
*/ */
#ifdef SQL_WCHART_CONVERT #ifdef SQL_WCHART_CONVERT
typedef wchar_t TCHAR; typedef wchar_t TCHAR;
#else #else
typedef signed short TCHAR; typedef signed short TCHAR;
#endif #endif
#else #else
typedef char TCHAR; typedef char TCHAR;
#endif #endif
#ifndef DONT_TD_VOID
typedef void VOID;
#endif
typedef unsigned short WORD; typedef unsigned short WORD;
#if (SIZEOF_LONG_INT == 4) #if (SIZEOF_LONG_INT == 4)
typedef unsigned long DWORD; typedef unsigned long DWORD;
#else #else
typedef unsigned int DWORD; typedef unsigned int DWORD;
#endif #endif
typedef unsigned char BYTE; typedef unsigned char BYTE;
#ifdef SQL_WCHART_CONVERT #ifdef SQL_WCHART_CONVERT
typedef wchar_t WCHAR; typedef wchar_t WCHAR;
skipping to change at line 117 skipping to change at line 115
typedef unsigned short WCHAR; typedef unsigned short WCHAR;
#endif #endif
typedef WCHAR* LPWSTR; typedef WCHAR* LPWSTR;
typedef const char* LPCSTR; typedef const char* LPCSTR;
typedef const WCHAR* LPCWSTR; typedef const WCHAR* LPCWSTR;
typedef TCHAR* LPTSTR; typedef TCHAR* LPTSTR;
typedef char* LPSTR; typedef char* LPSTR;
typedef DWORD* LPDWORD; typedef DWORD* LPDWORD;
#ifndef _WINDOWS_
typedef void* HINSTANCE; typedef void* HINSTANCE;
#endif
#endif #endif
/**************************** /****************************
* standard SQL* data types. use these as much as possible when using ODBC calls/vars * standard SQL* data types. use these as much as possible when using ODBC calls/vars
***************************/ ***************************/
typedef unsigned char SQLCHAR; typedef unsigned char SQLCHAR;
#if (ODBCVER >= 0x0300) #if (ODBCVER >= 0x0300)
typedef unsigned char SQLDATE; typedef unsigned char SQLDATE;
 End of changes. 5 change blocks. 
4 lines changed or deleted 4 lines changed or added


 unixodbc_conf.h   unixodbc_conf.h 
/* unixodbc_conf.h. Generated from unixodbc_conf.h.in by configure. */
#ifndef HAVE_UNISTD_H #ifndef HAVE_UNISTD_H
#define HAVE_UNISTD_H #define HAVE_UNISTD_H 1
#endif #endif
#ifndef HAVE_PWD_H #ifndef HAVE_PWD_H
#define HAVE_PWD_H #define HAVE_PWD_H 1
#endif #endif
#ifndef HAVE_SYS_TYPES_H
#define HAVE_SYS_TYPES_H #ifndef HAVE_SYS_TIME_H
#define HAVE_SYS_TIME_H 1
#endif
#ifndef ODBC_STD
/* #undef ODBC_STD */
#endif #endif
#ifndef UNICODE
/* #undef UNICODE */
#endif
#ifndef GUID_DEFINED
/* #undef GUID_DEFINED */
#endif
#ifndef SQL_WCHART_CONVERT
/* #undef SQL_WCHART_CONVERT */
#endif
#ifndef HAVE_LONG_LONG #ifndef HAVE_LONG_LONG
#define HAVE_LONG_LONG #define HAVE_LONG_LONG 1
#endif #endif
#ifndef ODBCINT64
#define ODBCINT64 long long #ifndef ODBCINT64_TYPEA
/* #undef ODBCINT64_TYPEA */
#endif #endif
#ifndef UODBCINT64
#define UODBCINT64 unsigned long long #ifndef UODBCINT64_TYPE
/* #undef UODBCINT64_TYPE */
#endif #endif
#ifndef DISABLE_INI_CACHING
/* #undef DISABLE_INI_CACHING */
#endif
#ifndef SIZEOF_LONG_INT #ifndef SIZEOF_LONG_INT
#define SIZEOF_LONG_INT 4 #define SIZEOF_LONG_INT 4
#endif
#ifndef ALLREADY_HAVE_WINDOWS_TYPE
/* #undef ALLREADY_HAVE_WINDOWS_TYPE */
#endif
#ifndef DONT_TD_VOID
/* #undef DONT_TD_VOID */
#endif
#ifndef DO_YOU_KNOW_WHAT_YOUR_ARE_DOING
/* #undef DO_YOU_KNOW_WHAT_YOUR_ARE_DOING */
#endif #endif
 End of changes. 11 change blocks. 
10 lines changed or deleted 49 lines changed or added


 uodbc_extras.h   uodbc_extras.h 
/********************************************************************* /*********************************************************************
* *
* This is based on code created by Peter Harvey, * This is based on code created by Peter Harvey,
* (pharvey@codebydesign.com). * (pharvey@codebydesign.com).
* *
* Modified and extended by Nick Gorham * Modified and extended by Nick Gorham
* (nick@easysoft.com). * (nick@lurcher.org).
* *
* Further modified and extend by Eric Sharkey * Further modified and extend by Eric Sharkey
* (sharkey@netrics.com). * (sharkey@netrics.com).
* *
* Any bugs or problems should be considered the fault of Nick or * Any bugs or problems should be considered the fault of Nick or
* Eric and not Peter. * Eric and not Peter.
* *
* copyright (c) 2005 Eric Sharkey * copyright (c) 2005 Eric Sharkey
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 uodbc_stats.h   uodbc_stats.h 
/********************************************************************* /*********************************************************************
* *
* This is based on code created by Peter Harvey, * This is based on code created by Peter Harvey,
* (pharvey@codebydesign.com). * (pharvey@codebydesign.com).
* *
* Modified and extended by Nick Gorham * Modified and extended by Nick Gorham
* (nick@easysoft.com). * (nick@lurcher.org).
* *
* Any bugs or problems should be considered the fault of Nick and not * Any bugs or problems should be considered the fault of Nick and not
* Peter. * Peter.
* *
* copyright (c) 1999 Nick Gorham * copyright (c) 1999 Nick Gorham
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/