GNOME.org
 

[libgda: 1/2] Add G_BEGIN_DECLS and

commit bad76394dc153b21a3789faa89096b33a6cee617
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jun 30 13:01:14 2009 +0200

    Add G_BEGIN_DECLS and
    G_END_DECLS so these can be used from C++.

 ChangeLog                                         |    5 +++++
 libgda/sql-parser/gda-statement-struct-compound.h |    4 ++++
 libgda/sql-parser/gda-statement-struct-decl.h     |    4 ++++
 libgda/sql-parser/gda-statement-struct-delete.h   |    4 ++++
 libgda/sql-parser/gda-statement-struct-insert.h   |    4 ++++
 libgda/sql-parser/gda-statement-struct-parts.h    |    4 ++++
 libgda/sql-parser/gda-statement-struct-pspec.h    |    3 +++
 libgda/sql-parser/gda-statement-struct-select.h   |    5 +++++
 libgda/sql-parser/gda-statement-struct-trans.h    |    4 ++++
 libgda/sql-parser/gda-statement-struct-unknown.h  |    4 ++++
 libgda/sql-parser/gda-statement-struct-update.h   |    4 ++++
 libgda/sql-parser/gda-statement-struct-util.h     |    4 ++++
 12 files changed, 49 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d5887a5..eeaf481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-30  Murray Cumming  <murrayc murrayc com>
+
+	* libgda/sql-parser/gda-statement-struct-*.h: Add G_BEGIN_DECLS and 
+	G_END_DECLS so these can be used from C++.
+
 2009-04-23  Vivien Malerba <malerba gnome-db org>
 
 	* libgda/gda-config.c: only display a warning if loading a provider fails if the
diff --git a/libgda/sql-parser/gda-statement-struct-compound.h b/libgda/sql-parser/gda-statement-struct-compound.h
index 595af0c..3b522f0 100644
--- a/libgda/sql-parser/gda-statement-struct-compound.h
+++ b/libgda/sql-parser/gda-statement-struct-compound.h
@@ -25,6 +25,8 @@
 #include <sql-parser/gda-statement-struct-decl.h>
 #include <sql-parser/gda-statement-struct-select.h>
 
+G_BEGIN_DECLS
+
 /*
  * Kinds
  */
@@ -70,4 +72,6 @@ GdaSqlAnyPart * _gda_sql_statement_compound_reduce (GdaSqlAnyPart *compound_or_s
 void gda_sql_statement_compound_set_type (GdaSqlStatement *stmt, GdaSqlStatementCompoundType type);
 void gda_sql_statement_compound_take_stmt (GdaSqlStatement *stmt, GdaSqlStatement *s);
 
+G_END_DECLS
+
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-decl.h b/libgda/sql-parser/gda-statement-struct-decl.h
index 4fe93ec..30df061 100644
--- a/libgda/sql-parser/gda-statement-struct-decl.h
+++ b/libgda/sql-parser/gda-statement-struct-decl.h
@@ -26,6 +26,8 @@
 #include <libgda/gda-meta-store.h>
 #include <libgda/gda-meta-struct.h>
 
+G_BEGIN_DECLS
+
 /* error reporting */
 extern GQuark gda_sql_error_quark (void);
 #define GDA_SQL_ERROR gda_sql_error_quark ()
@@ -166,4 +168,6 @@ typedef struct {
 	gpointer         _gda_reserved4;
 } GdaSqlStatementCheckValidityData;
 
+G_END_DECLS
+
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-delete.h b/libgda/sql-parser/gda-statement-struct-delete.h
index 2c2f65d..bb3ee42 100644
--- a/libgda/sql-parser/gda-statement-struct-delete.h
+++ b/libgda/sql-parser/gda-statement-struct-delete.h
@@ -26,6 +26,8 @@
 #include <sql-parser/gda-statement-struct-select.h>
 #include <sql-parser/gda-statement-struct-parts.h>
 
+G_BEGIN_DECLS
+
 /*
  * Structure definition
  */
@@ -50,4 +52,6 @@ GdaSqlStatementContentsInfo *_gda_sql_statement_delete_get_infos (void);
 void gda_sql_statement_delete_take_table_name (GdaSqlStatement *stmt, GValue *value);
 void gda_sql_statement_delete_take_condition (GdaSqlStatement *stmt, GdaSqlExpr *cond);
 
+G_END_DECLS
+
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-insert.h b/libgda/sql-parser/gda-statement-struct-insert.h
index 69fa787..8c1de64 100644
--- a/libgda/sql-parser/gda-statement-struct-insert.h
+++ b/libgda/sql-parser/gda-statement-struct-insert.h
@@ -26,6 +26,8 @@
 #include <sql-parser/gda-statement-struct-select.h>
 #include <sql-parser/gda-statement-struct-parts.h>
 
+G_BEGIN_DECLS
+
 /*
  * Structure definition
  */
@@ -58,4 +60,6 @@ void gda_sql_statement_insert_take_extra_values_list (GdaSqlStatement *stmt, GSL
 
 void gda_sql_statement_insert_take_select (GdaSqlStatement *stmt, GdaSqlStatement *select);
 
+G_END_DECLS
+
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-parts.h b/libgda/sql-parser/gda-statement-struct-parts.h
index 406c8c7..8894e7f 100644
--- a/libgda/sql-parser/gda-statement-struct-parts.h
+++ b/libgda/sql-parser/gda-statement-struct-parts.h
@@ -27,6 +27,8 @@
 #include <sql-parser/gda-statement-struct-decl.h>
 #include <libgda/gda-meta-struct.h>
 
+G_BEGIN_DECLS
+
 typedef struct _GdaSqlExpr      GdaSqlExpr;
 typedef struct _GdaSqlField     GdaSqlField;
 typedef struct _GdaSqlTable     GdaSqlTable;
@@ -343,4 +345,6 @@ void               gda_sql_select_order_free           (GdaSqlSelectOrder *order
 GdaSqlSelectOrder *gda_sql_select_order_copy           (GdaSqlSelectOrder *order);
 gchar             *gda_sql_select_order_serialize      (GdaSqlSelectOrder *order);
 
+G_END_DECLS
+
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-pspec.h b/libgda/sql-parser/gda-statement-struct-pspec.h
index 65981b1..76c68f0 100644
--- a/libgda/sql-parser/gda-statement-struct-pspec.h
+++ b/libgda/sql-parser/gda-statement-struct-pspec.h
@@ -23,6 +23,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+G_BEGIN_DECLS
+
 typedef struct _GdaSqlParamSpec GdaSqlParamSpec;
 
 /*
@@ -52,5 +54,6 @@ void             gda_sql_param_spec_take_nullok(GdaSqlParamSpec *pspec, GValue *
 void             gda_sql_param_spec_free       (GdaSqlParamSpec *pspec);
 gchar           *gda_sql_param_spec_serialize  (GdaSqlParamSpec *pspec);
 
+G_END_DECLS
 
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-select.h b/libgda/sql-parser/gda-statement-struct-select.h
index 2b368aa..61af908 100644
--- a/libgda/sql-parser/gda-statement-struct-select.h
+++ b/libgda/sql-parser/gda-statement-struct-select.h
@@ -25,6 +25,8 @@
 #include <sql-parser/gda-statement-struct-decl.h>
 #include <sql-parser/gda-statement-struct-parts.h>
 
+G_BEGIN_DECLS
+
 /*
  * Structure definition
  */
@@ -68,4 +70,7 @@ void gda_sql_statement_select_take_group_by (GdaSqlStatement *stmt, GSList *grou
 void gda_sql_statement_select_take_having_cond (GdaSqlStatement *stmt, GdaSqlExpr *expr);
 void gda_sql_statement_select_take_order_by (GdaSqlStatement *stmt, GSList *order_by);
 void gda_sql_statement_select_take_limits (GdaSqlStatement *stmt, GdaSqlExpr *count, GdaSqlExpr *offset);
+
+G_END_DECLS
+
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-trans.h b/libgda/sql-parser/gda-statement-struct-trans.h
index f549a8b..e0c5105 100644
--- a/libgda/sql-parser/gda-statement-struct-trans.h
+++ b/libgda/sql-parser/gda-statement-struct-trans.h
@@ -26,6 +26,8 @@
 #include <sql-parser/gda-statement-struct-decl.h>
 #include <sql-parser/gda-statement-struct-parts.h>
 
+G_BEGIN_DECLS
+
 /*
  * Structure definition
  */
@@ -58,4 +60,6 @@ void   gda_sql_statement_trans_take_mode (GdaSqlStatement *stmt, GValue *value);
 void   gda_sql_statement_trans_set_isol_level (GdaSqlStatement *stmt, GdaTransactionIsolation level);
 void   gda_sql_statement_trans_take_name (GdaSqlStatement *stmt, GValue *value);
 
+G_END_DECLS
+
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-unknown.h b/libgda/sql-parser/gda-statement-struct-unknown.h
index 9044056..4692b54 100644
--- a/libgda/sql-parser/gda-statement-struct-unknown.h
+++ b/libgda/sql-parser/gda-statement-struct-unknown.h
@@ -25,6 +25,8 @@
 #include <sql-parser/gda-statement-struct-decl.h>
 #include <sql-parser/gda-statement-struct-parts.h>
 
+G_BEGIN_DECLS
+
 /*
  * Structure definition
  */
@@ -47,4 +49,6 @@ GdaSqlStatementContentsInfo *_gda_sql_statement_unknown_get_infos (void);
  */
 void gda_sql_statement_unknown_take_expressions (GdaSqlStatement *stmt, GSList *expressions);
 
+G_END_DECLS
+
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-update.h b/libgda/sql-parser/gda-statement-struct-update.h
index 3219977..584d786 100644
--- a/libgda/sql-parser/gda-statement-struct-update.h
+++ b/libgda/sql-parser/gda-statement-struct-update.h
@@ -26,6 +26,8 @@
 #include <sql-parser/gda-statement-struct-select.h>
 #include <sql-parser/gda-statement-struct-parts.h>
 
+G_BEGIN_DECLS
+
 /*
  * Structure definition
  */
@@ -55,4 +57,6 @@ void gda_sql_statement_update_take_on_conflict (GdaSqlStatement *stmt, GValue *v
 void gda_sql_statement_update_take_condition (GdaSqlStatement *stmt, GdaSqlExpr *cond);
 void gda_sql_statement_update_take_set_value (GdaSqlStatement *stmt, GValue *fname, GdaSqlExpr *expr);
 
+G_END_DECLS
+
 #endif
diff --git a/libgda/sql-parser/gda-statement-struct-util.h b/libgda/sql-parser/gda-statement-struct-util.h
index 31e5193..14a6161 100644
--- a/libgda/sql-parser/gda-statement-struct-util.h
+++ b/libgda/sql-parser/gda-statement-struct-util.h
@@ -23,6 +23,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+G_BEGIN_DECLS
+
 /* utility functions */
 gchar    *_remove_quotes (gchar *str);
 gchar    *gda_sql_identifier_add_quotes (const gchar *str);
@@ -37,4 +39,6 @@ gchar    *gda_sql_identifier_remove_quotes (gchar *str);
 /* to be removed, only here for debug */
 gchar    *gda_sql_value_stringify (const GValue *value);
 
+G_END_DECLS
+
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]