upgraded the libodbc++ version to 0.2.4pre4
This commit is contained in:
fgerlits
parent
dade105057
commit
1ab5b8d645
|
|
@ -149,7 +149,7 @@ cxxunit_version=cppunit-1.10.2
|
||||||
cxxunit_tmpdir=$tools_tmpdir/cppunit
|
cxxunit_tmpdir=$tools_tmpdir/cppunit
|
||||||
|
|
||||||
libodbcxx_dir=$toolsdir/libodbc++
|
libodbcxx_dir=$toolsdir/libodbc++
|
||||||
libodbcxx_version=libodbc++-0.2.3-20050404
|
libodbcxx_version=libodbc++-0.2.4pre4
|
||||||
libodbcxx_tmpdir=$tools_tmpdir/libodbc++
|
libodbcxx_tmpdir=$tools_tmpdir/libodbc++
|
||||||
|
|
||||||
xmlrpcxx_dir=$toolsdir/xmlrpc++
|
xmlrpcxx_dir=$toolsdir/xmlrpc++
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ TOOLS_DIR = ${SRC_DIR}/tools
|
||||||
CPPUNIT_DIR = ${TOOLS_DIR}/cppunit
|
CPPUNIT_DIR = ${TOOLS_DIR}/cppunit
|
||||||
CPPUNIT_VERSION = cppunit-1.10.2
|
CPPUNIT_VERSION = cppunit-1.10.2
|
||||||
LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++
|
LIBODBCXX_DIR = ${TOOLS_DIR}/libodbc++
|
||||||
LIBODBCXX_VERSION = libodbc++-0.2.3-20050404
|
LIBODBCXX_VERSION = libodbc++-0.2.4pre4
|
||||||
XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++
|
XMLRPCXX_DIR = ${TOOLS_DIR}/xmlrpc++
|
||||||
XMLRPCXX_VERSION = xmlrpc++-20040713
|
XMLRPCXX_VERSION = xmlrpc++-20040713
|
||||||
TAGLIB_DIR = ${TOOLS_DIR}/taglib
|
TAGLIB_DIR = ${TOOLS_DIR}/taglib
|
||||||
|
|
|
||||||
|
|
@ -372,7 +372,7 @@ AC_MSG_NOTICE(
|
||||||
by Campcaster:
|
by Campcaster:
|
||||||
|
|
||||||
cppunit 1.10.2 ${COMPILE_CPPUNIT}
|
cppunit 1.10.2 ${COMPILE_CPPUNIT}
|
||||||
libodbc++ 0.2.3 yes
|
libodbc++ 0.2.4pre4 yes
|
||||||
taglib 1.4 yes
|
taglib 1.4 yes
|
||||||
xmlrpc++ 2004-07-13 yes
|
xmlrpc++ 2004-07-13 yes
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,2 @@
|
||||||
MD5 9dd6a3434f7eaef06fb2956937bbfe2c libodbc++-0.2.3-r2.ebuild 2335
|
MD5 9dd6a3434f7eaef06fb2956937bbfe2c libodbc++-0.2.3-r2.ebuild 2335
|
||||||
MD5 178bef12f773384d7586dd35c1ec0125 files/libodbc++-no-thread-dmaccess-mutex-fix.patch 498
|
|
||||||
MD5 fe58a608d688d22afe285174f283a89e files/libodbc++-no-namespace-closing-colon.patch 4840
|
|
||||||
MD5 398c2a40f5ea13cadbb9c297488ef43f files/libodbc++-0.2.3-to-cvs-20050404.patch 3249529
|
|
||||||
MD5 0aab8e76fcf033af346511bb1fef5f90 files/libodbc++-dont-install-some-docs.patch 6037
|
|
||||||
MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3-r2 67
|
MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3-r2 67
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,180 +0,0 @@
|
||||||
diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.am libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am
|
|
||||||
--- libodbc++-0.2.3-20050404/doc/Makefile.am 2001-06-12 12:38:12.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am 2005-04-04 21:16:50.447164392 +0200
|
|
||||||
@@ -17,41 +17,6 @@
|
|
||||||
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
||||||
# Boston, MA 02111-1307, USA.
|
|
||||||
|
|
||||||
-instdoc_dir=@docdir@/@PACKAGE@-@VERSION@/INSTALL
|
|
||||||
-
|
|
||||||
-instdoc_name=INSTALL
|
|
||||||
-
|
|
||||||
SUBDIRS=progref
|
|
||||||
|
|
||||||
-all-local: $(instdoc_name)
|
|
||||||
-
|
|
||||||
-$(instdoc_name): $(instdoc_name).sgml
|
|
||||||
- test -z "$(db2html)" && mkdir $@ || $(db2html) $<
|
|
||||||
-
|
|
||||||
-maintainer-clean-local:
|
|
||||||
- rm -rf $(instdoc_name)
|
|
||||||
-
|
|
||||||
-clean-local:
|
|
||||||
- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR*
|
|
||||||
-
|
|
||||||
-dist-hook: all-local
|
|
||||||
- cp -r $(srcdir)/$(instdoc_name) $(distdir)
|
|
||||||
-
|
|
||||||
-install-data-local:
|
|
||||||
- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images
|
|
||||||
- for i in $(srcdir)/$(instdoc_name)/*; do \
|
|
||||||
- fn=`basename $$i` \
|
|
||||||
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \
|
|
||||||
- done
|
|
||||||
- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \
|
|
||||||
- fn=`basename $$i` \
|
|
||||||
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \
|
|
||||||
- done
|
|
||||||
-
|
|
||||||
-uninstall-local:
|
|
||||||
- if test -d $(DESTDIR)$(instdoc_dir); then \
|
|
||||||
- rm -rf $(DESTDIR)$(instdoc_dir)/*; \
|
|
||||||
- rmdir $(DESTDIR)$(instdoc_dir) || true; \
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
-EXTRA_DIST=$(instdoc_name).sgml
|
|
||||||
+EXTRA_DIST=INSTALL.sgml
|
|
||||||
diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.in libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in
|
|
||||||
--- libodbc++-0.2.3-20050404/doc/Makefile.in 2005-04-04 18:21:26.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in 2005-04-04 21:16:50.447164392 +0200
|
|
||||||
@@ -174,13 +174,9 @@
|
|
||||||
target_alias = @target_alias@
|
|
||||||
zip = @zip@
|
|
||||||
|
|
||||||
-instdoc_dir = @docdir@/@PACKAGE@-@VERSION@/INSTALL
|
|
||||||
-
|
|
||||||
-instdoc_name = INSTALL
|
|
||||||
-
|
|
||||||
SUBDIRS = progref
|
|
||||||
|
|
||||||
-EXTRA_DIST = $(instdoc_name).sgml
|
|
||||||
+EXTRA_DIST = INSTALL.sgml
|
|
||||||
subdir = doc
|
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
||||||
@@ -382,12 +378,9 @@
|
|
||||||
|| exit 1; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
- $(MAKE) $(AM_MAKEFLAGS) \
|
|
||||||
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
|
||||||
- dist-hook
|
|
||||||
check-am: all-am
|
|
||||||
check: check-recursive
|
|
||||||
-all-am: Makefile all-local
|
|
||||||
+all-am: Makefile
|
|
||||||
installdirs: installdirs-recursive
|
|
||||||
installdirs-am:
|
|
||||||
|
|
||||||
@@ -417,7 +410,7 @@
|
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
|
||||||
clean: clean-recursive
|
|
||||||
|
|
||||||
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
|
|
||||||
+clean-am: clean-generic clean-libtool mostlyclean-am
|
|
||||||
|
|
||||||
distclean: distclean-recursive
|
|
||||||
-rm -f Makefile
|
|
||||||
@@ -432,7 +425,7 @@
|
|
||||||
|
|
||||||
info-am:
|
|
||||||
|
|
||||||
-install-data-am: install-data-local
|
|
||||||
+install-data-am:
|
|
||||||
|
|
||||||
install-exec-am:
|
|
||||||
|
|
||||||
@@ -444,8 +437,7 @@
|
|
||||||
|
|
||||||
maintainer-clean: maintainer-clean-recursive
|
|
||||||
-rm -f Makefile
|
|
||||||
-maintainer-clean-am: distclean-am maintainer-clean-generic \
|
|
||||||
- maintainer-clean-local
|
|
||||||
+maintainer-clean-am: distclean-am maintainer-clean-generic
|
|
||||||
|
|
||||||
mostlyclean: mostlyclean-recursive
|
|
||||||
|
|
||||||
@@ -459,59 +451,27 @@
|
|
||||||
|
|
||||||
ps-am:
|
|
||||||
|
|
||||||
-uninstall-am: uninstall-info-am uninstall-local
|
|
||||||
+uninstall-am: uninstall-info-am
|
|
||||||
|
|
||||||
uninstall-info: uninstall-info-recursive
|
|
||||||
|
|
||||||
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
|
|
||||||
- check-am clean clean-generic clean-libtool clean-local \
|
|
||||||
- clean-recursive ctags ctags-recursive distclean \
|
|
||||||
- distclean-generic distclean-libtool distclean-recursive \
|
|
||||||
- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
|
|
||||||
- info-recursive install install-am install-data install-data-am \
|
|
||||||
- install-data-local install-data-recursive install-exec \
|
|
||||||
- install-exec-am install-exec-recursive install-info \
|
|
||||||
- install-info-am install-info-recursive install-man \
|
|
||||||
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
|
|
||||||
+ clean-generic clean-libtool clean-recursive ctags \
|
|
||||||
+ ctags-recursive distclean distclean-generic distclean-libtool \
|
|
||||||
+ distclean-recursive distclean-tags distdir dvi dvi-am \
|
|
||||||
+ dvi-recursive info info-am info-recursive install install-am \
|
|
||||||
+ install-data install-data-am install-data-recursive \
|
|
||||||
+ install-exec install-exec-am install-exec-recursive \
|
|
||||||
+ install-info install-info-am install-info-recursive install-man \
|
|
||||||
install-recursive install-strip installcheck installcheck-am \
|
|
||||||
installdirs installdirs-am installdirs-recursive \
|
|
||||||
maintainer-clean maintainer-clean-generic \
|
|
||||||
- maintainer-clean-local maintainer-clean-recursive mostlyclean \
|
|
||||||
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
|
|
||||||
- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
|
|
||||||
- tags-recursive uninstall uninstall-am uninstall-info-am \
|
|
||||||
- uninstall-info-recursive uninstall-local uninstall-recursive
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-all-local: $(instdoc_name)
|
|
||||||
-
|
|
||||||
-$(instdoc_name): $(instdoc_name).sgml
|
|
||||||
- test -z "$(db2html)" && mkdir $@ || $(db2html) $<
|
|
||||||
-
|
|
||||||
-maintainer-clean-local:
|
|
||||||
- rm -rf $(instdoc_name)
|
|
||||||
-
|
|
||||||
-clean-local:
|
|
||||||
- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR*
|
|
||||||
-
|
|
||||||
-dist-hook: all-local
|
|
||||||
- cp -r $(srcdir)/$(instdoc_name) $(distdir)
|
|
||||||
-
|
|
||||||
-install-data-local:
|
|
||||||
- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images
|
|
||||||
- for i in $(srcdir)/$(instdoc_name)/*; do \
|
|
||||||
- fn=`basename $$i` \
|
|
||||||
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \
|
|
||||||
- done
|
|
||||||
- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \
|
|
||||||
- fn=`basename $$i` \
|
|
||||||
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \
|
|
||||||
- done
|
|
||||||
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
|
|
||||||
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
|
|
||||||
+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \
|
|
||||||
+ uninstall uninstall-am uninstall-info-am \
|
|
||||||
+ uninstall-info-recursive uninstall-recursive
|
|
||||||
|
|
||||||
-uninstall-local:
|
|
||||||
- if test -d $(DESTDIR)$(instdoc_dir); then \
|
|
||||||
- rm -rf $(DESTDIR)$(instdoc_dir)/*; \
|
|
||||||
- rmdir $(DESTDIR)$(instdoc_dir) || true; \
|
|
||||||
- fi
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
||||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
||||||
.NOEXPORT:
|
|
||||||
|
|
@ -1,130 +0,0 @@
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/callablestatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/callablestatement.h 2003-03-20 16:52:27.000000000 +0100
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h 2005-01-18 14:47:32.761605624 +0100
|
|
||||||
@@ -160,7 +160,7 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_CALLABLESTATEMENT_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/connection.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/connection.h 2001-06-12 12:38:16.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h 2005-01-18 14:47:41.210321224 +0100
|
|
||||||
@@ -204,7 +204,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_CONNECTION_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/databasemetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/databasemetadata.h 2001-06-12 12:38:17.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h 2005-01-18 14:47:44.922756848 +0100
|
|
||||||
@@ -1333,7 +1333,7 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_DATABASEMETADATA_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/drivermanager.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/drivermanager.h 2001-06-12 12:38:17.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h 2005-01-18 14:47:48.704181984 +0100
|
|
||||||
@@ -147,7 +147,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-};
|
|
||||||
+}
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_DRIVERMANAGER_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/errorhandler.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/errorhandler.h 2001-06-12 12:38:18.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h 2005-01-18 14:47:53.838401464 +0100
|
|
||||||
@@ -127,6 +127,6 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
#endif
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/preparedstatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/preparedstatement.h 2003-05-09 10:45:48.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h 2005-01-18 14:47:57.663819912 +0100
|
|
||||||
@@ -211,6 +211,6 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
#endif // __ODBCXX_PREPAREDSTATEMENT_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/resultset.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/resultset.h 2001-06-12 12:38:19.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h 2005-01-18 14:48:01.966165856 +0100
|
|
||||||
@@ -619,7 +619,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_RESULTSET_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/resultsetmetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/resultsetmetadata.h 2001-06-12 12:38:20.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h 2005-01-18 14:48:05.372647992 +0100
|
|
||||||
@@ -176,7 +176,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_RESULTSETMETADATA_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/statement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/statement.h 2003-03-20 16:52:32.000000000 +0100
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h 2005-01-18 14:48:11.589702856 +0100
|
|
||||||
@@ -260,7 +260,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_STATEMENT_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/threads.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/threads.h 2001-06-12 12:38:20.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h 2005-01-18 14:48:16.409970064 +0100
|
|
||||||
@@ -65,7 +65,7 @@
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
-}; //namespace odbc
|
|
||||||
+} //namespace odbc
|
|
||||||
|
|
||||||
// macro used all over the place
|
|
||||||
#define ODBCXX_LOCKER(mut) odbc::Locker _locker(mut)
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/types.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/types.h 2003-06-17 12:08:02.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h 2005-01-18 14:48:22.560035112 +0100
|
|
||||||
@@ -791,7 +791,7 @@
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_TYPES_H
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
diff -Naur libodbc++-0.2.3-20050404/src/drivermanager.cpp libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp
|
|
||||||
--- libodbc++-0.2.3-20050404/src/drivermanager.cpp 2005-02-27 23:37:23.000000000 +0100
|
|
||||||
+++ libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp 2005-04-04 18:35:25.725465880 +0200
|
|
||||||
@@ -87,8 +87,10 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef ODBCXX_ENABLE_THREADS
|
|
||||||
// remove the mutex as we can't rely on static destructors
|
|
||||||
DMAccessMutex(1);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -24,11 +24,6 @@ src_unpack() {
|
||||||
unpack ${A}
|
unpack ${A}
|
||||||
cd ${S}
|
cd ${S}
|
||||||
|
|
||||||
epatch ${FILESDIR}/libodbc++-0.2.3-to-cvs-20050404.patch
|
|
||||||
epatch ${FILESDIR}/libodbc++-no-namespace-closing-colon.patch
|
|
||||||
epatch ${FILESDIR}/libodbc++-no-thread-dmaccess-mutex-fix.patch
|
|
||||||
epatch ${FILESDIR}/libodbc++-dont-install-some-docs.patch
|
|
||||||
|
|
||||||
# toch the programmers reference stamp, so that it is not re-generated
|
# toch the programmers reference stamp, so that it is not re-generated
|
||||||
touch doc/progref/progref-stamp
|
touch doc/progref/progref-stamp
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,180 +0,0 @@
|
||||||
diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.am libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am
|
|
||||||
--- libodbc++-0.2.3-20050404/doc/Makefile.am 2001-06-12 12:38:12.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am 2005-04-04 21:16:50.447164392 +0200
|
|
||||||
@@ -17,41 +17,6 @@
|
|
||||||
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
||||||
# Boston, MA 02111-1307, USA.
|
|
||||||
|
|
||||||
-instdoc_dir=@docdir@/@PACKAGE@-@VERSION@/INSTALL
|
|
||||||
-
|
|
||||||
-instdoc_name=INSTALL
|
|
||||||
-
|
|
||||||
SUBDIRS=progref
|
|
||||||
|
|
||||||
-all-local: $(instdoc_name)
|
|
||||||
-
|
|
||||||
-$(instdoc_name): $(instdoc_name).sgml
|
|
||||||
- test -z "$(db2html)" && mkdir $@ || $(db2html) $<
|
|
||||||
-
|
|
||||||
-maintainer-clean-local:
|
|
||||||
- rm -rf $(instdoc_name)
|
|
||||||
-
|
|
||||||
-clean-local:
|
|
||||||
- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR*
|
|
||||||
-
|
|
||||||
-dist-hook: all-local
|
|
||||||
- cp -r $(srcdir)/$(instdoc_name) $(distdir)
|
|
||||||
-
|
|
||||||
-install-data-local:
|
|
||||||
- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images
|
|
||||||
- for i in $(srcdir)/$(instdoc_name)/*; do \
|
|
||||||
- fn=`basename $$i` \
|
|
||||||
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \
|
|
||||||
- done
|
|
||||||
- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \
|
|
||||||
- fn=`basename $$i` \
|
|
||||||
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \
|
|
||||||
- done
|
|
||||||
-
|
|
||||||
-uninstall-local:
|
|
||||||
- if test -d $(DESTDIR)$(instdoc_dir); then \
|
|
||||||
- rm -rf $(DESTDIR)$(instdoc_dir)/*; \
|
|
||||||
- rmdir $(DESTDIR)$(instdoc_dir) || true; \
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
-EXTRA_DIST=$(instdoc_name).sgml
|
|
||||||
+EXTRA_DIST=INSTALL.sgml
|
|
||||||
diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.in libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in
|
|
||||||
--- libodbc++-0.2.3-20050404/doc/Makefile.in 2005-04-04 18:21:26.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.in 2005-04-04 21:16:50.447164392 +0200
|
|
||||||
@@ -174,13 +174,9 @@
|
|
||||||
target_alias = @target_alias@
|
|
||||||
zip = @zip@
|
|
||||||
|
|
||||||
-instdoc_dir = @docdir@/@PACKAGE@-@VERSION@/INSTALL
|
|
||||||
-
|
|
||||||
-instdoc_name = INSTALL
|
|
||||||
-
|
|
||||||
SUBDIRS = progref
|
|
||||||
|
|
||||||
-EXTRA_DIST = $(instdoc_name).sgml
|
|
||||||
+EXTRA_DIST = INSTALL.sgml
|
|
||||||
subdir = doc
|
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
||||||
@@ -382,12 +378,9 @@
|
|
||||||
|| exit 1; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
- $(MAKE) $(AM_MAKEFLAGS) \
|
|
||||||
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
|
||||||
- dist-hook
|
|
||||||
check-am: all-am
|
|
||||||
check: check-recursive
|
|
||||||
-all-am: Makefile all-local
|
|
||||||
+all-am: Makefile
|
|
||||||
installdirs: installdirs-recursive
|
|
||||||
installdirs-am:
|
|
||||||
|
|
||||||
@@ -417,7 +410,7 @@
|
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
|
||||||
clean: clean-recursive
|
|
||||||
|
|
||||||
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
|
|
||||||
+clean-am: clean-generic clean-libtool mostlyclean-am
|
|
||||||
|
|
||||||
distclean: distclean-recursive
|
|
||||||
-rm -f Makefile
|
|
||||||
@@ -432,7 +425,7 @@
|
|
||||||
|
|
||||||
info-am:
|
|
||||||
|
|
||||||
-install-data-am: install-data-local
|
|
||||||
+install-data-am:
|
|
||||||
|
|
||||||
install-exec-am:
|
|
||||||
|
|
||||||
@@ -444,8 +437,7 @@
|
|
||||||
|
|
||||||
maintainer-clean: maintainer-clean-recursive
|
|
||||||
-rm -f Makefile
|
|
||||||
-maintainer-clean-am: distclean-am maintainer-clean-generic \
|
|
||||||
- maintainer-clean-local
|
|
||||||
+maintainer-clean-am: distclean-am maintainer-clean-generic
|
|
||||||
|
|
||||||
mostlyclean: mostlyclean-recursive
|
|
||||||
|
|
||||||
@@ -459,59 +451,27 @@
|
|
||||||
|
|
||||||
ps-am:
|
|
||||||
|
|
||||||
-uninstall-am: uninstall-info-am uninstall-local
|
|
||||||
+uninstall-am: uninstall-info-am
|
|
||||||
|
|
||||||
uninstall-info: uninstall-info-recursive
|
|
||||||
|
|
||||||
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
|
|
||||||
- check-am clean clean-generic clean-libtool clean-local \
|
|
||||||
- clean-recursive ctags ctags-recursive distclean \
|
|
||||||
- distclean-generic distclean-libtool distclean-recursive \
|
|
||||||
- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
|
|
||||||
- info-recursive install install-am install-data install-data-am \
|
|
||||||
- install-data-local install-data-recursive install-exec \
|
|
||||||
- install-exec-am install-exec-recursive install-info \
|
|
||||||
- install-info-am install-info-recursive install-man \
|
|
||||||
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
|
|
||||||
+ clean-generic clean-libtool clean-recursive ctags \
|
|
||||||
+ ctags-recursive distclean distclean-generic distclean-libtool \
|
|
||||||
+ distclean-recursive distclean-tags distdir dvi dvi-am \
|
|
||||||
+ dvi-recursive info info-am info-recursive install install-am \
|
|
||||||
+ install-data install-data-am install-data-recursive \
|
|
||||||
+ install-exec install-exec-am install-exec-recursive \
|
|
||||||
+ install-info install-info-am install-info-recursive install-man \
|
|
||||||
install-recursive install-strip installcheck installcheck-am \
|
|
||||||
installdirs installdirs-am installdirs-recursive \
|
|
||||||
maintainer-clean maintainer-clean-generic \
|
|
||||||
- maintainer-clean-local maintainer-clean-recursive mostlyclean \
|
|
||||||
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
|
|
||||||
- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
|
|
||||||
- tags-recursive uninstall uninstall-am uninstall-info-am \
|
|
||||||
- uninstall-info-recursive uninstall-local uninstall-recursive
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-all-local: $(instdoc_name)
|
|
||||||
-
|
|
||||||
-$(instdoc_name): $(instdoc_name).sgml
|
|
||||||
- test -z "$(db2html)" && mkdir $@ || $(db2html) $<
|
|
||||||
-
|
|
||||||
-maintainer-clean-local:
|
|
||||||
- rm -rf $(instdoc_name)
|
|
||||||
-
|
|
||||||
-clean-local:
|
|
||||||
- rm -rf $(instdoc_name).junk DBTOHTML_OUTPUT_DIR*
|
|
||||||
-
|
|
||||||
-dist-hook: all-local
|
|
||||||
- cp -r $(srcdir)/$(instdoc_name) $(distdir)
|
|
||||||
-
|
|
||||||
-install-data-local:
|
|
||||||
- $(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images
|
|
||||||
- for i in $(srcdir)/$(instdoc_name)/*; do \
|
|
||||||
- fn=`basename $$i` \
|
|
||||||
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \
|
|
||||||
- done
|
|
||||||
- for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \
|
|
||||||
- fn=`basename $$i` \
|
|
||||||
- $(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \
|
|
||||||
- done
|
|
||||||
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
|
|
||||||
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
|
|
||||||
+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \
|
|
||||||
+ uninstall uninstall-am uninstall-info-am \
|
|
||||||
+ uninstall-info-recursive uninstall-recursive
|
|
||||||
|
|
||||||
-uninstall-local:
|
|
||||||
- if test -d $(DESTDIR)$(instdoc_dir); then \
|
|
||||||
- rm -rf $(DESTDIR)$(instdoc_dir)/*; \
|
|
||||||
- rmdir $(DESTDIR)$(instdoc_dir) || true; \
|
|
||||||
- fi
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
||||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
||||||
.NOEXPORT:
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
diff -Naur libodbc++-0.2.3-20050404/include/odbc++/drivermanager.h libodbc++-0.2.3-20050404-gcc-4.0-fix/include/odbc++/drivermanager.h
|
|
||||||
--- libodbc++-0.2.3-20050404/include/odbc++/drivermanager.h 2001-06-12 12:38:17.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-20050404-gcc-4.0-fix/include/odbc++/drivermanager.h 2005-11-19 17:51:33.979494541 +0100
|
|
||||||
@@ -30,6 +30,7 @@
|
|
||||||
namespace odbc {
|
|
||||||
|
|
||||||
class Connection;
|
|
||||||
+ class ErrorHandler;
|
|
||||||
|
|
||||||
/** An ODBC Driver with it's information.
|
|
||||||
*/
|
|
||||||
|
|
@ -1,130 +0,0 @@
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/callablestatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/callablestatement.h 2003-03-20 16:52:27.000000000 +0100
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h 2005-01-18 14:47:32.761605624 +0100
|
|
||||||
@@ -160,7 +160,7 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_CALLABLESTATEMENT_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/connection.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/connection.h 2001-06-12 12:38:16.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h 2005-01-18 14:47:41.210321224 +0100
|
|
||||||
@@ -204,7 +204,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_CONNECTION_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/databasemetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/databasemetadata.h 2001-06-12 12:38:17.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h 2005-01-18 14:47:44.922756848 +0100
|
|
||||||
@@ -1333,7 +1333,7 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_DATABASEMETADATA_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/drivermanager.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/drivermanager.h 2001-06-12 12:38:17.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h 2005-01-18 14:47:48.704181984 +0100
|
|
||||||
@@ -147,7 +147,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-};
|
|
||||||
+}
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_DRIVERMANAGER_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/errorhandler.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/errorhandler.h 2001-06-12 12:38:18.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h 2005-01-18 14:47:53.838401464 +0100
|
|
||||||
@@ -127,6 +127,6 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
#endif
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/preparedstatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/preparedstatement.h 2003-05-09 10:45:48.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h 2005-01-18 14:47:57.663819912 +0100
|
|
||||||
@@ -211,6 +211,6 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
#endif // __ODBCXX_PREPAREDSTATEMENT_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/resultset.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/resultset.h 2001-06-12 12:38:19.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h 2005-01-18 14:48:01.966165856 +0100
|
|
||||||
@@ -619,7 +619,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_RESULTSET_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/resultsetmetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/resultsetmetadata.h 2001-06-12 12:38:20.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h 2005-01-18 14:48:05.372647992 +0100
|
|
||||||
@@ -176,7 +176,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_RESULTSETMETADATA_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/statement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/statement.h 2003-03-20 16:52:32.000000000 +0100
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h 2005-01-18 14:48:11.589702856 +0100
|
|
||||||
@@ -260,7 +260,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_STATEMENT_H
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/threads.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/threads.h 2001-06-12 12:38:20.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h 2005-01-18 14:48:16.409970064 +0100
|
|
||||||
@@ -65,7 +65,7 @@
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
-}; //namespace odbc
|
|
||||||
+} //namespace odbc
|
|
||||||
|
|
||||||
// macro used all over the place
|
|
||||||
#define ODBCXX_LOCKER(mut) odbc::Locker _locker(mut)
|
|
||||||
diff -Naur libodbc++-0.2.3/include/odbc++/types.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h
|
|
||||||
--- libodbc++-0.2.3/include/odbc++/types.h 2003-06-17 12:08:02.000000000 +0200
|
|
||||||
+++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h 2005-01-18 14:48:22.560035112 +0100
|
|
||||||
@@ -791,7 +791,7 @@
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
-}; // namespace odbc
|
|
||||||
+} // namespace odbc
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __ODBCXX_TYPES_H
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
diff -Naur libodbc++-0.2.3-20050404/src/drivermanager.cpp libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp
|
|
||||||
--- libodbc++-0.2.3-20050404/src/drivermanager.cpp 2005-02-27 23:37:23.000000000 +0100
|
|
||||||
+++ libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp 2005-04-04 18:35:25.725465880 +0200
|
|
||||||
@@ -87,8 +87,10 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef ODBCXX_ENABLE_THREADS
|
|
||||||
// remove the mutex as we can't rely on static destructors
|
|
||||||
DMAccessMutex(1);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
--- libodbc++-0.2.3-20050404/src/preparedstatement.cpp 2001-06-12 05:38:32.000000000 -0500
|
|
||||||
+++ libodbc++-0.2.3-20050404-x64/src/preparedstatement.cpp 2006-10-04 11:06:36.000000000 -0500
|
|
||||||
@@ -161,7 +161,7 @@
|
|
||||||
numParams_=np;
|
|
||||||
|
|
||||||
SQLSMALLINT sqlType;
|
|
||||||
- SQLUINTEGER prec;
|
|
||||||
+ SQLULEN prec;
|
|
||||||
SQLSMALLINT scale;
|
|
||||||
SQLSMALLINT nullable;
|
|
||||||
|
|
||||||
@@ -303,7 +303,7 @@
|
|
||||||
r=SQLParamData(hstmt_,¤tCol);
|
|
||||||
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_);
|
|
||||||
|
|
||||||
--- libodbc++-0.2.3-20050404/src/resultset.cpp 2003-06-17 05:10:32.000000000 -0500
|
|
||||||
+++ libodbc++-0.2.3-20050404-x64/src/resultset.cpp 2006-10-04 18:08:03.000000000 -0500
|
|
||||||
@@ -528,7 +528,7 @@
|
|
||||||
r=SQLParamData(hstmt_,¤tCol);
|
|
||||||
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_);
|
|
||||||
|
|
||||||
@@ -1356,8 +1356,9 @@
|
|
||||||
DataHandler* dh=rowset_->getColumn(idx);
|
|
||||||
ODBCXX_STREAM* s=dh->getStream();
|
|
||||||
if(s==NULL) {
|
|
||||||
- s=new DataStream(this,hstmt_,idx,SQL_C_BINARY,
|
|
||||||
- dh->dataStatus_[dh->currentRow_]);
|
|
||||||
+ SQLINTEGER Status=dh->dataStatus_[dh->currentRow_];
|
|
||||||
+ s=new DataStream(this,hstmt_,idx,SQL_C_BINARY,Status);
|
|
||||||
+ dh->dataStatus_[dh->currentRow_]=Status;
|
|
||||||
dh->setStream(s);
|
|
||||||
}
|
|
||||||
lastWasNull_=dh->isNull();
|
|
||||||
--- libodbc++-0.2.3-20050404/src/resultsetmetadata.cpp 2001-06-12 05:38:35.000000000 -0500
|
|
||||||
+++ libodbc++-0.2.3-20050404-x64/src/resultsetmetadata.cpp 2006-10-04 12:05:45.000000000 -0500
|
|
||||||
@@ -39,7 +39,7 @@
|
|
||||||
int ResultSetMetaData::_getNumericAttribute(unsigned int col,
|
|
||||||
SQLUSMALLINT attr)
|
|
||||||
{
|
|
||||||
- SQLINTEGER res=0;
|
|
||||||
+ SQLLEN res=0;
|
|
||||||
SQLRETURN r=
|
|
||||||
ODBC3_C(SQLColAttribute,SQLColAttributes)(resultSet_->hstmt_,
|
|
||||||
(SQLUSMALLINT)col,
|
|
||||||
@@ -63,7 +63,7 @@
|
|
||||||
odbc::Deleter<char> _buf(buf,true);
|
|
||||||
buf[maxlen]=0;
|
|
||||||
|
|
||||||
- SQLINTEGER res=0;
|
|
||||||
+ SQLLEN res=0;
|
|
||||||
SQLSMALLINT len=0;
|
|
||||||
|
|
||||||
SQLRETURN r=
|
|
||||||
--- libodbc++-0.2.3-20050404/src/statement.cpp 2003-03-28 08:26:02.000000000 -0500
|
|
||||||
+++ libodbc++-0.2.3-20050404-x64/src/statement.cpp 2006-10-04 12:06:54.000000000 -0500
|
|
||||||
@@ -672,7 +672,7 @@
|
|
||||||
|
|
||||||
if(lastExecute_!=ODBC3_C(SQL_NO_DATA,SQL_NO_DATA_FOUND)) {
|
|
||||||
|
|
||||||
- SQLINTEGER res;
|
|
||||||
+ SQLLEN res;
|
|
||||||
SQLRETURN r=SQLRowCount(hstmt_,&res);
|
|
||||||
this->_checkStmtError(hstmt_,r,"Error fetching update count");
|
|
||||||
return res;
|
|
||||||
--- libodbc++-0.2.3-20050404/src/datahandler.cpp 2006-10-04 17:37:32.000000000 -0500
|
|
||||||
+++ libodbc++-0.2.3-20050404-x64/src/datahandler.cpp 2006-10-04 12:07:52.000000000 -0500
|
|
||||||
@@ -269,7 +269,7 @@
|
|
||||||
};
|
|
||||||
this->setupBuffer(bs);
|
|
||||||
|
|
||||||
- dataStatus_=new SQLINTEGER[rows_];
|
|
||||||
+ dataStatus_=new SQLLEN[rows_];
|
|
||||||
|
|
||||||
//set everything to NULL
|
|
||||||
for(unsigned int i=0; i<rows_; i++) {
|
|
||||||
--- libodbc++-0.2.3-20050404/src/datahandler.h 2001-07-27 12:04:49.000000000 -0500
|
|
||||||
+++ libodbc++-0.2.3-20050404-x64/src/datahandler.h 2006-10-04 12:08:14.000000000 -0500
|
|
||||||
@@ -48,7 +48,7 @@
|
|
||||||
size_t rows_;
|
|
||||||
char* buffer_;
|
|
||||||
size_t bufferSize_;
|
|
||||||
- SQLINTEGER* dataStatus_;
|
|
||||||
+ SQLLEN* dataStatus_;
|
|
||||||
bool isStreamed_;
|
|
||||||
ODBCXX_STREAM* stream_;
|
|
||||||
bool ownStream_;
|
|
||||||
Binary file not shown.
|
|
@ -29,7 +29,7 @@
|
||||||
# Run this script to prepare libodbc++ 2.3 to be configured and compiled.
|
# Run this script to prepare libodbc++ 2.3 to be configured and compiled.
|
||||||
# To read more about libodbc++, see http://libodbcxx.sourceforge.net/
|
# To read more about libodbc++, see http://libodbcxx.sourceforge.net/
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
product=libodbc++-0.2.3-20050404
|
product=libodbc++-0.2.4pre4
|
||||||
|
|
||||||
reldir=`dirname $0`/..
|
reldir=`dirname $0`/..
|
||||||
basedir=`cd ${reldir}; pwd;`
|
basedir=`cd ${reldir}; pwd;`
|
||||||
|
|
@ -48,16 +48,5 @@ cd ${tmpdir}
|
||||||
if [ ! -d $product ]; then
|
if [ ! -d $product ]; then
|
||||||
tar xfj ${tar}
|
tar xfj ${tar}
|
||||||
cd $product
|
cd $product
|
||||||
# see http://sourceforge.net/tracker/index.php?func=detail&aid=1176652&group_id=19075&atid=319075
|
|
||||||
patch -p1 < $etcdir/libodbc++-no-namespace-closing-colon.patch
|
|
||||||
# see http://sourceforge.net/tracker/index.php?func=detail&aid=1176656&group_id=19075&atid=319075
|
|
||||||
patch -p1 < $etcdir/libodbc++-no-thread-dmaccess-mutex-fix.patch
|
|
||||||
# patch not submitted
|
|
||||||
patch -p1 < $etcdir/libodbc++-dont-install-some-docs.patch
|
|
||||||
# patch to fix bug #1545 (not submitted; already fixed in 0.2.4)
|
|
||||||
patch -p1 < $etcdir/libodbc++-gcc-4.0-fix.patch
|
|
||||||
# a similar patch submitted by somebody else:
|
|
||||||
# http://sourceforge.net/tracker/index.php?func=detail&aid=1595055&group_id=19075&atid=319075
|
|
||||||
patch -p1 < $etcdir/libodbc++-x64-fix.patch
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -49,7 +49,7 @@ COVERAGE_DIR = ${DOC_DIR}/coverage
|
||||||
ETC_DIR = ${BASE_DIR}/etc
|
ETC_DIR = ${BASE_DIR}/etc
|
||||||
TMP_DIR = ${BASE_DIR}/tmp
|
TMP_DIR = ${BASE_DIR}/tmp
|
||||||
|
|
||||||
LIBODBCXX_VERSION = libodbc++-0.2.3-20050404
|
LIBODBCXX_VERSION = libodbc++-0.2.4pre4
|
||||||
LIBODBCXX_DIR = ${TMP_DIR}/${LIBODBCXX_VERSION}
|
LIBODBCXX_DIR = ${TMP_DIR}/${LIBODBCXX_VERSION}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -32,18 +32,18 @@ dnl This is due to the fact that configure spreads a lot of trash around,
|
||||||
dnl like atom4te cache directories, config.* files, etc. into the directory
|
dnl like atom4te cache directories, config.* files, etc. into the directory
|
||||||
dnl it is being run from. We clearly don't want these in our base directory.
|
dnl it is being run from. We clearly don't want these in our base directory.
|
||||||
dnl-----------------------------------------------------------------------------
|
dnl-----------------------------------------------------------------------------
|
||||||
AC_INIT(libodbc++, 0.2.3, bugs@campware.org)
|
AC_INIT(libodbc++, 0.2.4pre4, bugs@campware.org)
|
||||||
AC_PREREQ(2.59)
|
AC_PREREQ(2.59)
|
||||||
AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
|
AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
|
||||||
AC_REVISION($Revision$)
|
AC_REVISION($Revision$)
|
||||||
|
|
||||||
AC_CONFIG_SRCDIR(../src/libodbc++-0.2.3-20050404.tar.bz2)
|
AC_CONFIG_SRCDIR(../src/libodbc++-0.2.4pre4.tar.bz2)
|
||||||
|
|
||||||
|
|
||||||
dnl untar the sources before anything happens
|
dnl untar the sources before anything happens
|
||||||
../bin/prepare.sh
|
../bin/prepare.sh
|
||||||
|
|
||||||
cd ../tmp/libodbc++-0.2.3-20050404
|
cd ../tmp/libodbc++-0.2.4pre4
|
||||||
./configure --enable-threads --prefix=$prefix
|
./configure --enable-threads --prefix=$prefix
|
||||||
cd -
|
cd -
|
||||||
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue