diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2009-01-27 05:13:10 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2009-01-27 05:13:10 +0000 |
| commit | 3f65f803c1a50cc5084e81709f115916aeef47cc (patch) | |
| tree | 19c8e5949ee8b520eaf3343bbacd12b015b5b8fe /databases/postgresql-odbc/files/patch-odbcapi.c | |
| parent | - Fix ODBCINT64 and UODBCINT64 definitions in unixodbc_conf.h (diff) | |
Fix build with unixODBC 2.2.14: in 2.2.14 signatures of several functions
(SQLExtendedFetch, SQLColAttribute, SQLColAttributeW) were fixed.
Approved by: portmgr (marcus)
Notes
Notes:
svn path=/head/; revision=226944
Diffstat (limited to 'databases/postgresql-odbc/files/patch-odbcapi.c')
| -rw-r--r-- | databases/postgresql-odbc/files/patch-odbcapi.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/databases/postgresql-odbc/files/patch-odbcapi.c b/databases/postgresql-odbc/files/patch-odbcapi.c new file mode 100644 index 000000000000..b7675e5b93bf --- /dev/null +++ b/databases/postgresql-odbc/files/patch-odbcapi.c @@ -0,0 +1,32 @@ +--- odbcapi.c.orig 2009-01-26 23:29:21.000000000 +0600 ++++ odbcapi.c 2009-01-26 23:30:15.000000000 +0600 +@@ -1111,11 +1111,7 @@ + HSTMT hstmt, + SQLUSMALLINT fFetchType, + SQLLEN irow, +-#ifdef WITH_UNIXODBC +- SQLROWSETSIZE *pcrow, +-#else + SQLULEN *pcrow, +-#endif /* WITH_UNIXODBC */ + SQLUSMALLINT *rgfRowStatus) + { + RETCODE ret; +@@ -1125,17 +1121,7 @@ + ENTER_STMT_CS(stmt); + SC_clear_error(stmt); + StartRollbackState(stmt); +-#ifdef WITH_UNIXODBC +- { +- SQLULEN retrieved; +- +- ret = PGAPI_ExtendedFetch(hstmt, fFetchType, irow, &retrieved, rgfRowStatus, 0, SC_get_ARDF(stmt)->size_of_rowset_odbc2); +- if (pcrow) +- *pcrow = retrieved; +- } +-#else + ret = PGAPI_ExtendedFetch(hstmt, fFetchType, irow, pcrow, rgfRowStatus, 0, SC_get_ARDF(stmt)->size_of_rowset_odbc2); +-#endif /* WITH_UNIXODBC */ + stmt->transition_status = STMT_TRANSITION_EXTENDED_FETCH; + ret = DiscardStatementSvp(stmt, ret, FALSE); + LEAVE_STMT_CS(stmt); |