]> git.pld-linux.org Git - packages/libgda.git/blame - libgda-freetds_buildfix.patch
projects / packages / libgda.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- obsoleted
[packages/libgda.git] / libgda-freetds_buildfix.patch
CommitLineData
e5fd960e 1diff -urN aa/libgda-1.2.0/providers/freetds/gda-freetds-provider.c libgda-1.2.0/providers/freetds/gda-freetds-provider.c
2--- aa/libgda-1.2.0/providers/freetds/gda-freetds-provider.c 2004-12-28 14:14:03.000000000 +0100
3+++ libgda-1.2.0/providers/freetds/gda-freetds-provider.c 2005-02-04 17:20:53.155918344 +0100
4@@ -803,7 +803,7 @@
5
6 /* there should not be any result tokens */
7 #ifdef HAVE_FREETDS_VER0_6X
8- while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds, &tds_cnc->result_type))
9+ while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds, &tds_cnc->result_type, NULL))
10 #else
11 while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds))
12 #endif
13diff -urN aa/libgda-1.2.0/providers/freetds/gda-freetds-recordset.c libgda-1.2.0/providers/freetds/gda-freetds-recordset.c
14--- aa/libgda-1.2.0/providers/freetds/gda-freetds-recordset.c 2004-12-28 14:12:43.000000000 +0100
15+++ libgda-1.2.0/providers/freetds/gda-freetds-recordset.c 2005-02-04 17:29:02.227568152 +0100
16@@ -341,7 +341,7 @@
17
18 #ifdef HAVE_FREETDS_VER0_6X
19 while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds,
20- &tds_cnc->result_type))
21+ &tds_cnc->result_type, NULL))
22 == TDS_SUCCEED) {
23 if (tds_cnc->result_type == TDS_ROW_RESULT) {
24 gint row_type, compute_id;
ac64ecd0 25diff -ur libgda-1.2.1.orig/providers/freetds/gda-freetds-message.c libgda-1.2.1/providers/freetds/gda-freetds-message.c
26--- libgda-1.2.1.orig/providers/freetds/gda-freetds-message.c 2003-01-16 01:10:30.000000000 +0100
27+++ libgda-1.2.1/providers/freetds/gda-freetds-message.c 2005-04-28 12:10:11.000000000 +0200
28@@ -32,7 +32,7 @@
29
30 GdaFreeTDSMessage
31 *gda_freetds_message_new (GdaConnection *cnc,
32- TDSMSGINFO *info,
33+ TDSMESSAGE *info,
34 const gboolean is_err_msg)
35 {
36 GdaFreeTDSConnectionData *tds_cnc;
37@@ -46,7 +46,7 @@
38 g_return_val_if_fail (message != NULL, NULL);
39
40 message->is_err_msg = is_err_msg;
41- memcpy ((void *) &message->msg, (void *) info, sizeof (TDSMSGINFO));
42+ memcpy ((void *) &message->msg, (void *) info, sizeof (TDSMESSAGE));
43 if (info->server != NULL)
44 message->msg.server = g_strdup (info->server);
45 if (info->message != NULL)
46@@ -61,7 +61,7 @@
47
48 GdaFreeTDSMessage *
49 gda_freetds_message_add (GdaConnection *cnc,
50- TDSMSGINFO *info,
51+ TDSMESSAGE *info,
52 const gboolean is_err_msg)
53 {
54 GdaFreeTDSMessage *msg = NULL;
55diff -ur libgda-1.2.1.orig/providers/freetds/gda-freetds-message.h libgda-1.2.1/providers/freetds/gda-freetds-message.h
56--- libgda-1.2.1.orig/providers/freetds/gda-freetds-message.h 2003-01-16 01:10:30.000000000 +0100
57+++ libgda-1.2.1/providers/freetds/gda-freetds-message.h 2005-04-28 12:03:07.000000000 +0200
58@@ -39,14 +39,14 @@
59 struct _GdaFreeTDSMessage {
60 gboolean is_err_msg;
61
62- TDSMSGINFO msg;
63+ TDSMESSAGE msg;
64 };
65
66 GdaFreeTDSMessage *gda_freetds_message_new (GdaConnection *cnc,
67- TDSMSGINFO *info,
68+ TDSMESSAGE *info,
69 const gboolean is_err_msg);
70 GdaFreeTDSMessage *gda_freetds_message_add (GdaConnection *cnc,
71- TDSMSGINFO *info,
72+ TDSMESSAGE *info,
73 const gboolean is_err_msg);
74 void gda_freetds_message_free (GdaFreeTDSMessage *message);
75
76diff -ur libgda-1.2.1.orig/providers/freetds/gda-freetds-provider.c libgda-1.2.1/providers/freetds/gda-freetds-provider.c
77--- libgda-1.2.1.orig/providers/freetds/gda-freetds-provider.c 2004-12-28 14:14:03.000000000 +0100
78+++ libgda-1.2.1/providers/freetds/gda-freetds-provider.c 2005-04-28 12:09:58.000000000 +0200
79@@ -119,10 +119,10 @@
80 #if defined(HAVE_FREETDS_VER0_6X) || defined(HAVE_FREETDS_VER0_60)
81 static int gda_freetds_provider_tds_handle_info_msg (TDSCONTEXT *,
82 TDSSOCKET *,
83- TDSMSGINFO *);
84+ TDSMESSAGE *);
85 static int gda_freetds_provider_tds_handle_err_msg (TDSCONTEXT *,
86 TDSSOCKET *,
87- TDSMSGINFO *);
88+ TDSMESSAGE *);
89 #else
90 static int gda_freetds_provider_tds_handle_info_msg (void *aStruct);
91 static int gda_freetds_provider_tds_handle_err_msg (void *aStruct);
92@@ -663,7 +663,7 @@
93 GdaParameterList *params)
94 {
95 GdaDataModel *model = NULL;
96- TDSCOLINFO col;
97+ TDSCOLUMN col;
98 GdaValueType gda_type;
99 GdaValue *value = NULL;
100 gint i = 1;
101@@ -1043,7 +1043,7 @@
102 const gboolean is_err_msg)
103 {
104 TDSSOCKET *tds = (TDSSOCKET *) aStruct;
105- TDSMSGINFO *msg_info = (TDSMSGINFO *) bStruct;
106+ TDSMESSAGE *msg_info = (TDSMESSAGE *) bStruct;
107 GdaConnection *cnc = NULL;
108 GdaFreeTDSConnectionData *tds_cnc = NULL;
109 GdaError *error = NULL;
110@@ -1099,7 +1099,7 @@
111 /* FIXME: rewrite tds_handle_message as well/use new parameters here */
112 static int
113 gda_freetds_provider_tds_handle_info_msg (TDSCONTEXT *ctx, TDSSOCKET *tds,
114- TDSMSGINFO *msg)
115+ TDSMESSAGE *msg)
116 {
117 return gda_freetds_provider_tds_handle_message ((void *) tds,
118 #ifdef HAVE_FREETDS_VER0_6X
119@@ -1121,7 +1121,7 @@
120 /* FIXME: rewrite tds_handle_message as well/use new parameters here */
121 static int
122 gda_freetds_provider_tds_handle_err_msg (TDSCONTEXT *ctx, TDSSOCKET *tds,
123- TDSMSGINFO *msg)
124+ TDSMESSAGE *msg)
125 {
126 return gda_freetds_provider_tds_handle_message ((void *) tds,
127 #ifdef HAVE_FREETDS_VER0_6X
128diff -ur libgda-1.2.1.orig/providers/freetds/gda-freetds-provider.h libgda-1.2.1/providers/freetds/gda-freetds-provider.h
129--- libgda-1.2.1.orig/providers/freetds/gda-freetds-provider.h 2003-09-17 13:05:03.000000000 +0200
130+++ libgda-1.2.1/providers/freetds/gda-freetds-provider.h 2005-04-28 11:22:27.000000000 +0200
131@@ -64,7 +64,7 @@
132 #endif
133 TDSSOCKET *tds; /* connection handle */
134 #ifdef HAVE_FREETDS_VER0_6X
135- TDSCONNECTINFO *config; /* tds connect struct */
136+ TDSCONNECTION *config; /* tds connect struct */
137 #else
138 TDSCONFIGINFO *config; /* tds config struct */
139 #endif
140diff -ur libgda-1.2.1.orig/providers/freetds/gda-freetds-recordset.c libgda-1.2.1/providers/freetds/gda-freetds-recordset.c
141--- libgda-1.2.1.orig/providers/freetds/gda-freetds-recordset.c 2004-12-28 14:12:43.000000000 +0100
142+++ libgda-1.2.1/providers/freetds/gda-freetds-recordset.c 2005-04-28 12:09:36.000000000 +0200
143@@ -61,7 +61,7 @@
144 /* Private utility functions */
145
146 /* w/o results */
147-static TDSCOLINFO *gda_freetds_dup_tdscolinfo (TDSCOLINFO *col);
148+static TDSCOLUMN *gda_freetds_dup_tdscolinfo (TDSCOLUMN *col);
149 static GdaRow *gda_freetds_get_current_row(GdaFreeTDSRecordset *recset);
150
151
152@@ -69,7 +69,7 @@
153 *gda_freetds_recordset_describe_column (GdaDataModel *model, gint col)
154 {
155 GdaFreeTDSRecordset *recset = (GdaFreeTDSRecordset *) model;
156- TDSCOLINFO *colinfo = NULL;
157+ TDSCOLUMN *colinfo = NULL;
158 GdaFieldAttributes *attribs = NULL;
159 gchar name[256];
160
161@@ -80,7 +80,7 @@
162 if (col >= recset->priv->columns->len) {
163 return NULL;
164 }
165- colinfo = (TDSCOLINFO *) g_ptr_array_index(recset->priv->columns, col);
166+ colinfo = (TDSCOLUMN *) g_ptr_array_index(recset->priv->columns, col);
167
168 if (!colinfo) {
169 return NULL;
170@@ -215,7 +215,7 @@
171 }
172 if (recset->priv->columns) {
173 while (recset->priv->columns->len > 0) {
174- TDSCOLINFO *col = (TDSCOLINFO *) g_ptr_array_index (recset->priv->columns, 0);
175+ TDSCOLUMN *col = (TDSCOLUMN *) g_ptr_array_index (recset->priv->columns, 0);
176 if (col != NULL) {
177 g_free (col);
178 col = NULL;
179@@ -253,7 +253,7 @@
180
181 for (i = 0; i < recset->priv->res->num_cols; i++) {
182 GdaValue *field;
183- TDSCOLINFO *col;
184+ TDSCOLUMN *col;
185
186 field = gda_row_get_value (row, i);
187 col = recset->priv->res->columns[i];
188@@ -266,16 +266,16 @@
189 return row;
190 }
191
192-static TDSCOLINFO
193-*gda_freetds_dup_tdscolinfo (TDSCOLINFO *col)
194+static TDSCOLUMN
195+*gda_freetds_dup_tdscolinfo (TDSCOLUMN *col)
196 {
197- TDSCOLINFO *copy = NULL;
198+ TDSCOLUMN *copy = NULL;
199
200 g_return_val_if_fail (col != NULL, NULL);
201
202- copy = g_new0(TDSCOLINFO, 1);
203+ copy = g_new0(TDSCOLUMN, 1);
204 if (copy) {
205- memcpy(copy, col, sizeof(TDSCOLINFO));
206+ memcpy(copy, col, sizeof(TDSCOLUMN));
207
208 /* set pointers to NULL */
209 copy->column_nullbind = NULL;
210@@ -322,7 +322,7 @@
211 {
212 GdaFreeTDSConnectionData *tds_cnc = NULL;
213 GdaFreeTDSRecordset *recset = NULL;
214- TDSCOLINFO *col = NULL;
215+ TDSCOLUMN *col = NULL;
216 GdaRow *row = NULL;
217 GdaError *error = NULL;
218 gboolean columns_set = FALSE;
219diff -ur libgda-1.2.1.orig/providers/freetds/gda-freetds-types.c libgda-1.2.1/providers/freetds/gda-freetds-types.c
220--- libgda-1.2.1.orig/providers/freetds/gda-freetds-types.c 2003-03-09 19:55:34.000000000 +0100
221+++ libgda-1.2.1/providers/freetds/gda-freetds-types.c 2005-04-28 11:58:19.000000000 +0200
222@@ -35,7 +35,7 @@
223 static void
224 gda_freetds_set_gdavalue_by_datetime (GdaValue *field,
225 TDS_DATETIME *dt,
226- TDSCOLINFO *col
227+ TDSCOLUMN *col
228 )
229 {
230 GDate date;
231@@ -82,7 +82,7 @@
232 static void
233 gda_freetds_set_gdavalue_by_datetime4 (GdaValue *field,
234 TDS_DATETIME4 *dt4,
235- TDSCOLINFO *col
236+ TDSCOLUMN *col
237 )
238 {
239 GDate date;
240@@ -123,7 +123,7 @@
241 */
242
243 const GdaValueType
244-gda_freetds_get_value_type (TDSCOLINFO *col)
245+gda_freetds_get_value_type (TDSCOLUMN *col)
246 {
247 g_return_val_if_fail (col != NULL, GDA_VALUE_TYPE_UNKNOWN);
248
249@@ -185,7 +185,7 @@
250
251
252 void
253-gda_freetds_set_gdavalue (GdaValue *field, gchar *val, TDSCOLINFO *col,
254+gda_freetds_set_gdavalue (GdaValue *field, gchar *val, TDSCOLUMN *col,
255 GdaFreeTDSConnectionData *tds_cnc)
256 {
257 const TDS_INT max_size = 255;
258diff -ur libgda-1.2.1.orig/providers/freetds/gda-freetds-types.h libgda-1.2.1/providers/freetds/gda-freetds-types.h
259--- libgda-1.2.1.orig/providers/freetds/gda-freetds-types.h 2003-01-16 01:10:30.000000000 +0100
260+++ libgda-1.2.1/providers/freetds/gda-freetds-types.h 2005-04-28 12:08:39.000000000 +0200
261@@ -34,9 +34,9 @@
262
263 G_BEGIN_DECLS
264
265-void gda_freetds_set_gdavalue (GdaValue *field, gchar *val, TDSCOLINFO *col,
266+void gda_freetds_set_gdavalue (GdaValue *field, gchar *val, TDSCOLUMN *col,
267 GdaFreeTDSConnectionData *tds_cnc);
268-const GdaValueType gda_freetds_get_value_type (TDSCOLINFO *col);
269+const GdaValueType gda_freetds_get_value_type (TDSCOLUMN *col);
270
271
272 G_END_DECLS
GNU Data Access library
This page took 0.115126 seconds and 4 git commands to generate.