Mercurial > mxe-octave

annotate src/libodbc++-1-win32.patch @ 7207:9ed6500e56d3 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 17 May 2024 20:16:41 +0200
parents 99516e73b368
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 972
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
972
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
4 --- libodbc++-0.2.5.orig/configure.ac 2009-08-20 23:39:08.000000000 +0200
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 +++ libodbc++-0.2.5/configure.ac 2010-02-04 22:40:32.000000000 +0100
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6 @@ -118,7 +118,7 @@
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7 if test "x$iodbc_ok" != "xyes" &&
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 test "x$odbc_ok" != "xyes"
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 then
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 - AC_MSG_ERROR([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?])
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11 + AC_MSG_WARN([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?])
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12 fi
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 AC_ARG_WITH(odbc-version,
e5d55b815b89 improved naming of patch files
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
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 +++ libodbc++-0.2.5/src/datastream.h 2009-10-27 23:14:22.000000000 +0100
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 @@ -35,7 +35,7 @@
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 #if defined(ODBCXX_QT)
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 # include <qiodevice.h>
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 #endif
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 -
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22 +#include <stdio.h>
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23 namespace odbc {
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
24
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
25 #if !defined(ODBCXX_QT)
e5d55b815b89 improved naming of patch files
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
e5d55b815b89 improved naming of patch files
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
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28 @@ -474,7 +474,7 @@
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29 * @param idx The column index, starting at 1
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30 * @param val The value to set
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
31 */
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
32 - Guid ResultSet::getGuid(int idx);
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
33 + Guid getGuid(int idx);
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
34 #endif
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
35 /** Sets the value of a column to an int
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
36 * @param idx The column index, starting at 1