Mercurial > mxe-octave

annotate src/libodbc++-win32.patch @ 714:29f1ba4559ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
point consequently to "doc/index.html" instead of "doc/index.html or doc/README"
author Volker Grabsch <vog@notjusthosting.com>
date Mon, 08 Feb 2010 00:58:06 +0100
parents dd87627dec30
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
641
dab071eac9c0 simplified file markers
Volker Grabsch <vog@notjusthosting.com>
parents: 518
diff changeset
1 This file is part of mingw-cross-env.
714
29f1ba4559ae point consequently to "doc/index.html" instead of "doc/index.html or doc/README"
Volker Grabsch <vog@notjusthosting.com>
parents: 678
diff changeset
2 See doc/index.html for further information.
518
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
678
dd87627dec30 use autoconf for package libodbc++
Volker Grabsch <vog@notjusthosting.com>
parents: 641
diff changeset
4 --- libodbc++-0.2.5.orig/configure.ac 2009-08-20 23:39:08.000000000 +0200
dd87627dec30 use autoconf for package libodbc++
Volker Grabsch <vog@notjusthosting.com>
parents: 641
diff changeset
5 +++ libodbc++-0.2.5/configure.ac 2010-02-04 22:40:32.000000000 +0100
dd87627dec30 use autoconf for package libodbc++
Volker Grabsch <vog@notjusthosting.com>
parents: 641
diff changeset
6 @@ -118,7 +118,7 @@
dd87627dec30 use autoconf for package libodbc++
Volker Grabsch <vog@notjusthosting.com>
parents: 641
diff changeset
7 if test "x$iodbc_ok" != "xyes" &&
dd87627dec30 use autoconf for package libodbc++
Volker Grabsch <vog@notjusthosting.com>
parents: 641
diff changeset
8 test "x$odbc_ok" != "xyes"
518
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 then
678
dd87627dec30 use autoconf for package libodbc++
Volker Grabsch <vog@notjusthosting.com>
parents: 641
diff changeset
10 - AC_MSG_ERROR([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?])
dd87627dec30 use autoconf for package libodbc++
Volker Grabsch <vog@notjusthosting.com>
parents: 641
diff changeset
11 + AC_MSG_WARN([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?])
518
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12 fi
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13
678
dd87627dec30 use autoconf for package libodbc++
Volker Grabsch <vog@notjusthosting.com>
parents: 641
diff changeset
14 AC_ARG_WITH(odbc-version,
518
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15 --- libodbc++-0.2.5.orig/src/datastream.h 2009-01-06 12:20:05.000000000 +0100
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 +++ libodbc++-0.2.5/src/datastream.h 2009-10-27 23:14:22.000000000 +0100
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 @@ -35,7 +35,7 @@
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 #if defined(ODBCXX_QT)
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 # include <qiodevice.h>
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 #endif
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 -
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22 +#include <stdio.h>
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23 namespace odbc {
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
24
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
25 #if !defined(ODBCXX_QT)
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
26 --- libodbc++-0.2.5.orig/include/odbc++/resultset.h 2009-03-07 07:41:09.000000000 +0100
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
27 +++ libodbc++-0.2.5/include/odbc++/resultset.h 2009-10-27 23:07:54.000000000 +0100
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28 @@ -474,7 +474,7 @@
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29 * @param idx The column index, starting at 1
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30 * @param val The value to set
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
31 */
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
32 - Guid ResultSet::getGuid(int idx);
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
33 + Guid getGuid(int idx);
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
34 #endif
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
35 /** Sets the value of a column to an int
7f6a2f90a32c new package: libodbc++ (by Mark Brand)
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
36 * @param idx The column index, starting at 1