[libgda/LIBGDA_4.2] Fixed build problems with commit 3ed8d3

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 1524d2cd4b709eb45b14633701317fbc4b3b8fcc
Author: Daniel Espinosa <despinosa src gnome org>
Date:   Mon Oct 17 13:17:52 2011 -0500

    Fixed build problems with commit 3ed8d3

 libgda/gda-sql-builder.c |    6 +++---
 libgda/gda-sql-builder.h |    3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/libgda/gda-sql-builder.c b/libgda/gda-sql-builder.c
index 60069d7..d3121b6 100644
--- a/libgda/gda-sql-builder.c
+++ b/libgda/gda-sql-builder.c
@@ -1825,7 +1825,7 @@ gda_sql_builder_compound_add_sub_select (GdaSqlBuilder *builder, GdaSqlStatement
  *
  * Add a sub select to a COMPOUND statement
  *
- * Since: 4.2
+ * Since: 4.2.10
  */
 void
 gda_sql_builder_compound_add_sub_select_from_builder (GdaSqlBuilder *builder, GdaSqlBuilder *subselect)
@@ -2039,10 +2039,10 @@ gda_sql_builder_import_expression (GdaSqlBuilder *builder, GdaSqlExpr *expr)
  *
  * Returns: the ID of the new expression, or %0 if there was an error
  *
- * Since: 4.2
+ * Since: 4.2.10
  */
 GdaSqlBuilderId
-gda_sql_builder_import_expression_from_builder (GdaSqlBuilder *builder, GdaSqlBuilder *query, daSqlBuilderId *expr_id)
+gda_sql_builder_import_expression_from_builder (GdaSqlBuilder *builder, GdaSqlBuilder *query, GdaSqlBuilderId expr_id)
 {
  GdaSqlExpr *expr;
 
diff --git a/libgda/gda-sql-builder.h b/libgda/gda-sql-builder.h
index 7e6169c..5d342a7 100644
--- a/libgda/gda-sql-builder.h
+++ b/libgda/gda-sql-builder.h
@@ -127,12 +127,11 @@ void              gda_sql_builder_select_group_by (GdaSqlBuilder *builder, GdaSq
 void              gda_sql_builder_compound_set_type (GdaSqlBuilder *builder, GdaSqlStatementCompoundType compound_type);
 void              gda_sql_builder_compound_add_sub_select (GdaSqlBuilder *builder, GdaSqlStatement *sqlst);
 void              gda_sql_builder_compound_add_sub_select_from_builder (GdaSqlBuilder *builder, GdaSqlBuilder *subselect);
-void              gda_sql_builder_compound_add_sub_select_from_builder (GdaSqlBuilder *builder, GdaSqlBuilder *subselect);
 
 /* import/Export API */
 GdaSqlExpr       *gda_sql_builder_export_expression (GdaSqlBuilder *builder, GdaSqlBuilderId id);
 GdaSqlBuilderId gda_sql_builder_import_expression (GdaSqlBuilder *builder, GdaSqlExpr *expr);
-GdaSqlBuilderId gda_sql_builder_import_expression_from_builder (GdaSqlBuilder *builder, GdaSqlBuilder *query, daSqlBuilderId *expr_id);
+GdaSqlBuilderId gda_sql_builder_import_expression_from_builder (GdaSqlBuilder *builder, GdaSqlBuilder *query, GdaSqlBuilderId expr_id);
 
 G_END_DECLS