1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 10_psqlodbc-64bit.dpatch by Peter Eisentraut <peter_e@gmx.net>
4
## DP: fixes several misguided assumptions that sizeof(long)==4 (bug #254847)
7
diff -urNad psqlodbc-07.03.0200/connection.h /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/connection.h
8
--- psqlodbc-07.03.0200/connection.h 2003-09-15 10:25:03.000000000 +0200
9
+++ /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/connection.h 2004-11-12 20:15:47.000000000 +0100
14
- long translation_option;
15
+ UDWORD translation_option;
16
HINSTANCE translation_handle;
17
DataSourceToDriverProc DataSourceToDriver;
18
DriverToDataSourceProc DriverToDataSource;
19
diff -urNad psqlodbc-07.03.0200/dlg_specific.c /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/dlg_specific.c
20
--- psqlodbc-07.03.0200/dlg_specific.c 2003-08-27 12:17:53.000000000 +0200
21
+++ /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/dlg_specific.c 2004-11-12 20:15:47.000000000 +0100
23
/* Abbrebiation is needed ? */
24
if (abbrev || strlen(connect_string) >= len)
26
- unsigned long flag = 0;
28
if (ci->disallow_premature)
29
flag |= BIT_DISALLOWPREMATURE;
32
unfoldCXAttribute(ConnInfo *ci, const char *value)
38
if (strlen(value) < 2)
40
diff -urNad psqlodbc-07.03.0200/psqlodbc.h /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/psqlodbc.h
41
--- psqlodbc-07.03.0200/psqlodbc.h 2003-08-27 12:17:53.000000000 +0200
42
+++ /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/psqlodbc.h 2004-11-12 20:15:47.000000000 +0100
45
* Comments: See "notice.txt" for copyright and license information.
47
- * $Id: psqlodbc.h,v 1.78 2003/08/27 10:17:53 hinoue Exp $
48
+ * $Id: psqlodbc.h,v 1.1.1.1 2004/01/22 15:02:52 mpitt Exp $
58
-#define Int4 long int
59
-#define UInt4 unsigned int
61
-#define UInt2 unsigned short
63
-#if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC)
64
+# if defined(HAVE_INTTYPES_H)
65
+# include <inttypes.h>
67
+# if defined(HAVE_STDINT_H)
72
+# define Int4 int32_t
73
+# define UInt4 uint32_t
74
+# define Int2 int16_t
75
+# define UInt2 uint16_t
77
+# if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC)
79
typedef double SDOUBLE;
92
-#define UInt4 unsigned int
94
-#define UInt2 unsigned short
101
diff -urNad psqlodbc-07.03.0200/socket.c /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/socket.c
102
--- psqlodbc-07.03.0200/socket.c 2002-11-06 10:44:55.000000000 +0100
103
+++ /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/socket.c 2004-11-12 20:15:47.000000000 +0100
108
- unsigned long iaddr;
115
if (self->socket != -1)
117
diff -urNad psqlodbc-07.03.0200/statement.c /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/statement.c
118
--- psqlodbc-07.03.0200/statement.c 2003-09-15 10:25:03.000000000 +0200
119
+++ /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/statement.c 2004-11-12 20:15:47.000000000 +0100
121
* just the current row number. But it could be more sophisticated
122
* someday, such as mapping a key to a 32 bit value
126
SC_get_bookmark(StatementClass *self)
128
return (self->currTuple + 1);
129
diff -urNad psqlodbc-07.03.0200/statement.h /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/statement.h
130
--- psqlodbc-07.03.0200/statement.h 2003-09-24 05:47:30.000000000 +0200
131
+++ /tmp/dpep.AqWwq0/psqlodbc-07.03.0200/statement.h 2004-11-12 20:15:47.000000000 +0100
133
void SC_free_params(StatementClass *self, char option);
134
void SC_log_error(const char *func, const char *desc, const StatementClass *self);
135
time_t SC_get_time(StatementClass *self);
136
-unsigned long SC_get_bookmark(StatementClass *self);
137
+UInt4 SC_get_bookmark(StatementClass *self);
138
RETCODE SC_pos_update(StatementClass *self, UWORD irow, UDWORD index);
139
RETCODE SC_pos_delete(StatementClass *self, UWORD irow, UDWORD index);
140
RETCODE SC_pos_refresh(StatementClass *self, UWORD irow, UDWORD index);