← Back to branch summary

~ubuntu-branches/ubuntu/saucy/psqlodbc/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/psqlodbc-580878.diff

  • Committer: Bazaar Package Importer
  • Author(s): Christoph Berg
  • Date: 2011-04-05 14:48:23 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20110405144823-n77supsa1hjj0ik6
Tags: 1:09.00.0200-1
http://bugs.debian.org/618210
http://bugs.debian.org/565611
http://bugs.debian.org/472818
* New upstream release.
* Fix installing {A,W}/usr/lib/odbc.  Closes: #618210.
* Convert to 3.0 (quilt).
* Remove psqlodbc-580878.diff: implemented upstream.
* Remove psqlodbc-585476.diff: was caused by #519006 which is now closed.
* Update description, suggested by Martin Eberhard Schauer.
  Closes: #565611.
* New maintainer.  Closes: #472818.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/psqlodbc-580878.diff
1
 
diff -Nur -x '*.orig' -x '*~' psqlodbc-08.03.0200//odbcapi.c psqlodbc-08.03.0200.new//odbcapi.c
2
 
--- psqlodbc-08.03.0200//odbcapi.c      2010-06-01 09:48:30.414644587 +0000
3
 
+++ psqlodbc-08.03.0200.new//odbcapi.c  2010-06-01 09:48:33.398648715 +0000
4
 
@@ -1105,11 +1105,7 @@
5
 
                                 HSTMT hstmt,
6
 
                                 SQLUSMALLINT fFetchType,
7
 
                                 SQLLEN irow,
8
 
-#ifdef WITH_UNIXODBC
9
 
-                                SQLROWSETSIZE *pcrow,
10
 
-#else
11
 
                                 SQLULEN *pcrow,
12
 
-#endif /* WITH_UNIXODBC */
13
 
                                 SQLUSMALLINT *rgfRowStatus)
14
 
 {
15
 
        RETCODE ret;
16
 
diff -Nur -x '*.orig' -x '*~' psqlodbc-08.03.0200//odbcapi30.c psqlodbc-08.03.0200.new//odbcapi30.c
17
 
--- psqlodbc-08.03.0200//odbcapi30.c    2006-11-14 15:29:25.000000000 +0000
18
 
+++ psqlodbc-08.03.0200.new//odbcapi30.c        2010-06-01 09:49:02.990665586 +0000
19
 
@@ -118,13 +118,7 @@
20
 
                        SQLPOINTER CharacterAttribute,
21
 
                        SQLSMALLINT BufferLength,
22
 
                        SQLSMALLINT *StringLength,
23
 
-#if defined(_WIN64)
24
 
                        SQLLEN *NumericAttribute
25
 
-#elif defined(WITH_UNIXODBC) || defined(WIN32)
26
 
-                       SQLPOINTER NumericAttribute
27
 
-#else
28
 
-                       SQLLEN *NumericAttribute
29
 
-#endif
30
 
                        )
31
 
 {
32
 
        CSTR    func = "SQLColAttribute";
33
 
diff -Nur -x '*.orig' -x '*~' psqlodbc-08.03.0200//odbcapi30w.c psqlodbc-08.03.0200.new//odbcapi30w.c
34
 
--- psqlodbc-08.03.0200//odbcapi30w.c   2007-04-03 14:49:02.000000000 +0000
35
 
+++ psqlodbc-08.03.0200.new//odbcapi30w.c       2010-06-01 09:49:20.598668018 +0000
36
 
@@ -255,11 +255,7 @@
37
 
        SQLPOINTER      pCharAttr,
38
 
        SQLSMALLINT     cbCharAttrMax,  
39
 
        SQLSMALLINT     *pcbCharAttr,
40
 
-#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64))
41
 
-       SQLPOINTER      pNumAttr
42
 
-#else
43
 
        SQLLEN          *pNumAttr
44
 
-#endif
45
 
        )
46
 
 {
47
 
        CSTR func = "SQLColAttributeW";