diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-03-31 23:43:04 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-03-31 23:43:04 +0000 |
| commit | 0e78d56a5930526b6ca445fb5ce86cdd1a0c0ba3 (patch) | |
| tree | bec69f4c764c5156185c25934fbf472e38e2a9a2 /databases/libgda3 | |
| parent | Fix build on the sparc64 7.0 systems. (diff) | |
Fix build on 4.X.
PR: 94941
Submitted by: Tod McQuillin <devin@spamcop.net>
Notes
Notes:
svn path=/head/; revision=158510
Diffstat (limited to 'databases/libgda3')
5 files changed, 58 insertions, 4 deletions
diff --git a/databases/libgda3/files/patch-libgda_gda-query-target.c b/databases/libgda3/files/patch-libgda_gda-query-target.c new file mode 100644 index 000000000000..fbdcaf721fa3 --- /dev/null +++ b/databases/libgda3/files/patch-libgda_gda-query-target.c @@ -0,0 +1,12 @@ +--- libgda/gda-query-target.c~ Mon Jan 23 00:18:37 2006 ++++ libgda/gda-query-target.c Sun Mar 26 10:03:52 2006 +@@ -732,8 +732,8 @@ + g_free (str); + + if (target->priv->entity_ref) { +- str = NULL; + GdaObject *base = gda_object_ref_get_ref_object (target->priv->entity_ref); ++ str = NULL; + + if (base) { + str = gda_xml_storage_get_xml_id (GDA_XML_STORAGE (base)); diff --git a/databases/libgda3/files/patch-libgda_handlers_gda-handler-numerical.c b/databases/libgda3/files/patch-libgda_handlers_gda-handler-numerical.c new file mode 100644 index 000000000000..de8c67a2e089 --- /dev/null +++ b/databases/libgda3/files/patch-libgda_handlers_gda-handler-numerical.c @@ -0,0 +1,11 @@ +--- libgda/handlers/gda-handler-numerical.c~ Mon Jan 23 02:57:38 2006 ++++ libgda/handlers/gda-handler-numerical.c Sun Mar 26 10:18:42 2006 +@@ -231,7 +231,7 @@ + + switch (type) { + case GDA_VALUE_TYPE_BIGINT: +- value = gda_value_new_bigint (atoll (str)); ++ value = gda_value_new_bigint (strtoll (str, (char **)NULL, 10)); + break; + case GDA_VALUE_TYPE_DOUBLE: + value = gda_value_new_double (atof (str)); diff --git a/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c b/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c index 7d7611235aa0..58b766996f58 100644 --- a/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c +++ b/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c @@ -1,6 +1,15 @@ ---- ../../work-/libgda-1.9.100/providers/mysql/gda-mysql-recordset.c Tue Nov 8 14:56:45 2005 -+++ providers/mysql/gda-mysql-recordset.c Tue Nov 8 14:59:26 2005 -@@ -569,6 +569,7 @@ +--- providers/mysql/gda-mysql-recordset.c.orig Thu Mar 2 22:28:54 2006 ++++ providers/mysql/gda-mysql-recordset.c Sun Mar 26 10:20:02 2006 +@@ -141,7 +141,7 @@ + if (is_unsigned) { + gda_value_set_biguint (gda_value, strtoull (value, NULL, 0)); + } else { +- gda_value_set_bigint (gda_value, atoll (value)); ++ gda_value_set_bigint (gda_value, strtoll (value, (char **)NULL, 0)); + } + break; + case FIELD_TYPE_SHORT : +@@ -584,6 +584,7 @@ colnum != gda_data_model_get_n_columns (GDA_DATA_MODEL(model)); colnum++) { @@ -8,7 +17,7 @@ attrs = gda_data_model_describe_column (GDA_DATA_MODEL(model), colnum); mysql_field = mysql_fetch_field_direct (priv_data->mysql_res, colnum); -@@ -577,7 +578,7 @@ +@@ -592,7 +593,7 @@ else column_name = gda_data_model_get_column_title (GDA_DATA_MODEL (model), colnum); diff --git a/databases/libgda3/files/patch-providers_ibmdb2_gda-ibmdb2-types.c b/databases/libgda3/files/patch-providers_ibmdb2_gda-ibmdb2-types.c new file mode 100644 index 000000000000..f51f91d03e79 --- /dev/null +++ b/databases/libgda3/files/patch-providers_ibmdb2_gda-ibmdb2-types.c @@ -0,0 +1,11 @@ +--- providers/ibmdb2/gda-ibmdb2-types.c~ Thu Jan 12 07:10:33 2006 ++++ providers/ibmdb2/gda-ibmdb2-types.c Sun Mar 26 10:19:26 2006 +@@ -115,7 +115,7 @@ + gda_value_set_integer (value, *((gint*)field->column_data)); + break; + case SQL_BIGINT: +- gda_value_set_bigint (value, (gint64)atoll(field->column_data)); ++ gda_value_set_bigint (value, (gint64)strtoll(field->column_data, (char **)NULL, 10)); + break; + case SQL_REAL: + gda_value_set_single (value, *((gfloat*)field->column_data)); diff --git a/databases/libgda3/files/patch-providers_oracle_utils.c b/databases/libgda3/files/patch-providers_oracle_utils.c new file mode 100644 index 000000000000..46b894ce4907 --- /dev/null +++ b/databases/libgda3/files/patch-providers_oracle_utils.c @@ -0,0 +1,11 @@ +--- providers/oracle/utils.c~ Wed Mar 15 07:25:51 2006 ++++ providers/oracle/utils.c Sun Mar 26 10:20:18 2006 +@@ -415,7 +415,7 @@ + g_free (string_buffer); + break; + case GDA_VALUE_TYPE_BIGINT: +- gda_value_set_bigint (value, atoll (ora_value->value)); ++ gda_value_set_bigint (value, strtoll (ora_value->value, (char **)NULL, 10)); + break; + case GDA_VALUE_TYPE_INTEGER: + gda_value_set_integer (value, atol (ora_value->value)); |