summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorMax Khon <fjoe@FreeBSD.org>2007-02-23 05:30:56 +0000
committerMax Khon <fjoe@FreeBSD.org>2007-02-23 05:30:56 +0000
commit0b2b7c0705cc1ff2fe443eec55465fcc1ace4df6 (patch)
treeac70c85b9e46980697f5b9669f70e70d5c70724b /databases
parentUnbreak. (diff)
Fix build with gcc41 on amd64
Notes
Notes: svn path=/head/; revision=185723
Diffstat (limited to 'databases')
-rw-r--r--databases/libodbc++/files/patch-src-preparedstatement.cpp13
-rw-r--r--databases/libodbc++/files/patch-src-resultset.cpp11
2 files changed, 22 insertions, 2 deletions
diff --git a/databases/libodbc++/files/patch-src-preparedstatement.cpp b/databases/libodbc++/files/patch-src-preparedstatement.cpp
index 56a74708de26..c40fed6ed88e 100644
--- a/databases/libodbc++/files/patch-src-preparedstatement.cpp
+++ b/databases/libodbc++/files/patch-src-preparedstatement.cpp
@@ -1,5 +1,5 @@
---- src/preparedstatement.cpp.orig Sun Nov 12 13:28:34 2006
-+++ src/preparedstatement.cpp Sun Nov 12 13:30:27 2006
+--- src/preparedstatement.cpp.orig Tue Jun 12 10:38:32 2001
++++ src/preparedstatement.cpp Fri Feb 23 05:23:46 2007
@@ -161,7 +161,7 @@
numParams_=np;
@@ -9,3 +9,12 @@
SQLSMALLINT scale;
SQLSMALLINT nullable;
+@@ -303,7 +303,7 @@
+ r=SQLParamData(hstmt_,&currentCol);
+ this->_checkStmtError(hstmt_,r,"SQLParamData failure");
+ if(r==SQL_NEED_DATA) {
+- DataHandler* dh=rowset_->getColumn((int)currentCol);
++ DataHandler* dh=rowset_->getColumn((long)currentCol);
+
+ assert(dh->isStreamed_);
+
diff --git a/databases/libodbc++/files/patch-src-resultset.cpp b/databases/libodbc++/files/patch-src-resultset.cpp
new file mode 100644
index 000000000000..fee2c3925aae
--- /dev/null
+++ b/databases/libodbc++/files/patch-src-resultset.cpp
@@ -0,0 +1,11 @@
+--- src/resultset.cpp.orig Fri Feb 23 05:24:16 2007
++++ src/resultset.cpp Fri Feb 23 05:24:27 2007
+@@ -528,7 +528,7 @@
+ r=SQLParamData(hstmt_,&currentCol);
+ this->_checkStmtError(hstmt_,r,"SQLParamData failure");
+ if(r==SQL_NEED_DATA) {
+- DataHandler* dh=rowset_->getColumn((int)currentCol);
++ DataHandler* dh=rowset_->getColumn((long)currentCol);
+
+ assert(dh->isStreamed_);
+