diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-18 15:46:12 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-18 15:46:12 +0100 |
commit | 82e56b34417677fc5ad8718a516874fb5351e60f (patch) | |
tree | 2f157396a89875f5f3543c62e7f4d5f9042cfb94 /community-staging/psqlodbc/fix-function-declarations.patch | |
parent | e63aad93b3e68c372e525d86c3277b2fa4bddb24 (diff) | |
parent | 146025aa1c838c12fa7b4873414da73816bfb6bd (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/python2-pymongo/PKGBUILD
extra/clamav/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/lcms2/PKGBUILD
extra/libxi/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'community-staging/psqlodbc/fix-function-declarations.patch')
-rw-r--r-- | community-staging/psqlodbc/fix-function-declarations.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/community-staging/psqlodbc/fix-function-declarations.patch b/community-staging/psqlodbc/fix-function-declarations.patch new file mode 100644 index 000000000..4504661b0 --- /dev/null +++ b/community-staging/psqlodbc/fix-function-declarations.patch @@ -0,0 +1,47 @@ +diff -upr psqlodbc-08.04.0100.orig/odbcapi30.c psqlodbc-08.04.0100/odbcapi30.c +--- psqlodbc-08.04.0100.orig/odbcapi30.c 2008-10-07 00:46:09.000000000 +0300 ++++ psqlodbc-08.04.0100/odbcapi30.c 2009-09-19 20:13:57.000000000 +0300 +@@ -118,13 +118,7 @@ SQLColAttribute(SQLHSTMT StatementHandle + SQLPOINTER CharacterAttribute, + SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength, +-#if defined(_WIN64) + SQLLEN *NumericAttribute +-#elif defined(WITH_UNIXODBC) || defined(WIN32) +- SQLPOINTER NumericAttribute +-#else +- SQLLEN *NumericAttribute +-#endif + ) + { + CSTR func = "SQLColAttribute"; +diff -upr psqlodbc-08.04.0100.orig/odbcapi30w.c psqlodbc-08.04.0100/odbcapi30w.c +--- psqlodbc-08.04.0100.orig/odbcapi30w.c 2009-03-22 16:17:10.000000000 +0200 ++++ psqlodbc-08.04.0100/odbcapi30w.c 2009-09-19 20:22:17.000000000 +0300 +@@ -262,11 +262,7 @@ SQLRETURN SQL_API SQLColAttributeW( + SQLPOINTER pCharAttr, + SQLSMALLINT cbCharAttrMax, + SQLSMALLINT *pcbCharAttr, +-#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64)) +- SQLPOINTER pNumAttr +-#else + SQLLEN *pNumAttr +-#endif + ) + { + CSTR func = "SQLColAttributeW"; +diff -upr psqlodbc-08.04.0100.orig/odbcapi.c psqlodbc-08.04.0100/odbcapi.c +--- psqlodbc-08.04.0100.orig/odbcapi.c 2008-11-23 03:00:53.000000000 +0200 ++++ psqlodbc-08.04.0100/odbcapi.c 2009-09-19 20:13:56.000000000 +0300 +@@ -1111,11 +1111,7 @@ SQLExtendedFetch( + HSTMT hstmt, + SQLUSMALLINT fFetchType, + SQLLEN irow, +-#ifdef WITH_UNIXODBC +- SQLROWSETSIZE *pcrow, +-#else + SQLULEN *pcrow, +-#endif /* WITH_UNIXODBC */ + SQLUSMALLINT *rgfRowStatus) + { + RETCODE ret; |