anjuta r4830 - in trunk: . plugins/symbol-db

[mcora svn gnome org]

Author: mcora
Date: Wed Mar  4 22:41:26 2009
New Revision: 4830
URL: http://svn.gnome.org/viewvc/anjuta?rev=4830&view=rev

Log:
	* plugins/symbol-db/symbol-db-engine-core.c:
	* plugins/symbol-db/symbol-db-engine-priv.h:
	* plugins/symbol-db/symbol-db-engine-queries.c:
	* plugins/symbol-db/symbol-db-engine-utils.c:
	fixed #573858 â link fail on Solaris for plugin symbol-db.

Modified:
   trunk/ChangeLog
   trunk/plugins/symbol-db/symbol-db-engine-core.c
   trunk/plugins/symbol-db/symbol-db-engine-priv.h
   trunk/plugins/symbol-db/symbol-db-engine-queries.c
   trunk/plugins/symbol-db/symbol-db-engine-utils.c

Modified: trunk/plugins/symbol-db/symbol-db-engine-core.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine-core.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-engine-core.c	Wed Mar  4 22:41:26 2009
@@ -213,22 +213,22 @@
 sdb_engine_add_new_symbol (SymbolDBEngine * dbe, const tagEntry * tag_entry,
 						   int file_defined_id, gboolean sym_update);
 
-inline const GdaStatement *
+GNUC_INLINE const GdaStatement *
 sdb_engine_get_statement_by_query_id (SymbolDBEngine * dbe, static_query_type query_id);
 
-inline const GdaSet *
+GNUC_INLINE const GdaSet *
 sdb_engine_get_query_parameters_list (SymbolDBEngine *dbe, static_query_type query_id);
 
-inline const DynChildQueryNode *
+GNUC_INLINE const DynChildQueryNode *
 sdb_engine_get_dyn_query_node_by_id (SymbolDBEngine *dbe, dyn_query_type query_id,
 									 SymExtraInfo sym_info, gsize other_parameters);
 
-inline const DynChildQueryNode *
+GNUC_INLINE const DynChildQueryNode *
 sdb_engine_insert_dyn_query_node_by_id (SymbolDBEngine *dbe, dyn_query_type query_id,
 									 	SymExtraInfo sym_info, gsize other_parameters,
 										const gchar *sql);
 
-inline gint
+GNUC_INLINE gint
 sdb_engine_get_tuple_id_by_unique_name (SymbolDBEngine * dbe, static_query_type qtype,
 										gchar * param_key,
 										GValue * param_value);
@@ -236,7 +236,7 @@
 /*
  * implementation starts here 
  */
-static inline gint
+static GNUC_INLINE gint
 sdb_engine_cache_lookup (GHashTable* hash_table, const gchar* lookup)
 {
 	gpointer orig_key = NULL;
@@ -254,7 +254,7 @@
 	return -1;
 }
 
-static inline void
+static GNUC_INLINE void
 sdb_engine_insert_cache (GHashTable* hash_table, const gchar* key,
 						 gint value)
 {
@@ -403,7 +403,7 @@
  * these queries are time-critical.
  * A GdaSet will also be populated once, avoiding so to create again later on.
  */
-inline const GdaStatement *
+GNUC_INLINE const GdaStatement *
 sdb_engine_get_statement_by_query_id (SymbolDBEngine * dbe, static_query_type query_id)
 {
 	static_query_node *node;
@@ -440,7 +440,7 @@
 /**
  *
  */
-inline const DynChildQueryNode *
+GNUC_INLINE const DynChildQueryNode *
 sdb_engine_get_dyn_query_node_by_id (SymbolDBEngine *dbe, dyn_query_type query_id,
 									 SymExtraInfo sym_info, gsize other_parameters)
 {
@@ -497,7 +497,7 @@
  * sdb_engine_get_dyn_query_node_by_id () that the node we're going to add 
  * isn't yet inserted.
  */
-inline const DynChildQueryNode *
+GNUC_INLINE const DynChildQueryNode *
 sdb_engine_insert_dyn_query_node_by_id (SymbolDBEngine *dbe, dyn_query_type query_id,
 									 	SymExtraInfo sym_info, gsize other_parameters,
 										const gchar *sql)
@@ -612,7 +612,7 @@
  * Return a GdaSet of parameters calculated from the statement. It does not check
  * if it's null. You *must* be sure to have called sdb_engine_get_statement_by_query_id () first.
  */
-inline const GdaSet *
+GNUC_INLINE const GdaSet *
 sdb_engine_get_query_parameters_list (SymbolDBEngine *dbe, static_query_type query_id)
 {
 	SymbolDBEnginePriv *priv;
@@ -720,7 +720,7 @@
  *
  * @return -1 on error. Otherwise the id of tuple.
  */
-inline gint
+GNUC_INLINE gint
 sdb_engine_get_tuple_id_by_unique_name (SymbolDBEngine * dbe, static_query_type qtype,
 										gchar * param_key,
 										GValue * param_value)
@@ -795,7 +795,7 @@
  * @return -1 on error. Otherwise the id of table
  *
  */
-static inline gint
+static GNUC_INLINE gint
 sdb_engine_get_tuple_id_by_unique_name2 (SymbolDBEngine * dbe, 
 										 static_query_type qtype,
 										 gchar * param_key1,
@@ -890,7 +890,7 @@
 }
 
 /* ### Thread note: this function inherits the mutex lock ### */
-static inline gint
+static GNUC_INLINE gint
 sdb_engine_get_tuple_id_by_unique_name3 (SymbolDBEngine * dbe, 
 										 static_query_type qtype,
 										 gchar * param_key1,
@@ -1007,7 +1007,7 @@
 }
 
 /* ### Thread note: this function inherits the mutex lock ### */
-static inline gint
+static GNUC_INLINE gint
 sdb_engine_get_tuple_id_by_unique_name4 (SymbolDBEngine * dbe, 
 										 static_query_type qtype,
 										 gchar * param_key1,
@@ -3499,7 +3499,7 @@
 }
 
 /* ### Thread note: this function inherits the mutex lock ### */
-static inline gint
+static GNUC_INLINE gint
 sdb_engine_add_new_sym_type (SymbolDBEngine * dbe, const tagEntry * tag_entry)
 {
 /*
@@ -3912,7 +3912,7 @@
 }
 
 /* ### Thread note: this function inherits the mutex lock ### */
-static inline gint
+static GNUC_INLINE gint
 sdb_engine_add_new_scope_definition (SymbolDBEngine * dbe, const tagEntry * tag_entry,
 									 gint type_table_id)
 {
@@ -4023,7 +4023,7 @@
  *
  * @return the table_id of the inserted tuple. -1 on error.
  */
-static inline gint
+static GNUC_INLINE gint
 sdb_engine_add_new_tmp_heritage_scope (SymbolDBEngine * dbe,
 									   const tagEntry * tag_entry,
 									   gint symbol_referer_id)
@@ -4220,7 +4220,7 @@
  *
  * Return the symbol_id of the changed symbol 
  */
-static inline gint
+static GNUC_INLINE gint
 sdb_engine_second_pass_update_scope_1 (SymbolDBEngine * dbe,
 									   GdaDataModel * data, gint data_row,
 									   gchar * token_name,

Modified: trunk/plugins/symbol-db/symbol-db-engine-priv.h
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine-priv.h	(original)
+++ trunk/plugins/symbol-db/symbol-db-engine-priv.h	Wed Mar  4 22:41:26 2009
@@ -31,6 +31,11 @@
 #include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
 
+#ifdef __GNUC__
+#define GNUC_INLINE inline
+#else
+#define GNUC_INLINE 
+#endif
 
 /* file should be specified without the ".db" extension. */
 #define ANJUTA_DB_FILE	".anjuta_sym_db"

Modified: trunk/plugins/symbol-db/symbol-db-engine-queries.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine-queries.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-engine-queries.c	Wed Mar  4 22:41:26 2009
@@ -32,23 +32,23 @@
  * extern declarations 
  */
 
-extern inline const GdaStatement *
+extern GNUC_INLINE const GdaStatement *
 sdb_engine_get_statement_by_query_id (SymbolDBEngine * dbe, static_query_type query_id);
 
-extern inline const GdaSet *
+extern GNUC_INLINE const GdaSet *
 sdb_engine_get_query_parameters_list (SymbolDBEngine *dbe, static_query_type query_id);
 
-extern inline const DynChildQueryNode *
+extern GNUC_INLINE const DynChildQueryNode *
 sdb_engine_get_dyn_query_node_by_id (SymbolDBEngine *dbe, dyn_query_type query_id,
 									 SymExtraInfo sym_info, gsize other_parameters);
 
 extern void sdb_engine_dyn_child_query_node_destroy (gpointer data);
 
-extern inline const DynChildQueryNode *
+extern GNUC_INLINE const DynChildQueryNode *
 sdb_engine_insert_dyn_query_node_by_id (SymbolDBEngine *dbe, dyn_query_type query_id,
 									 	SymExtraInfo sym_info, gsize other_parameters,
 										const gchar *sql);
-extern inline gint
+extern GNUC_INLINE gint
 sdb_engine_get_tuple_id_by_unique_name (SymbolDBEngine * dbe, static_query_type qtype,
 										gchar * param_key,
 										GValue * param_value);
@@ -58,7 +58,7 @@
  * implementation starts here 
  */
 
-static inline gint
+static GNUC_INLINE gint
 sdb_engine_walk_down_scope_path (SymbolDBEngine *dbe, const GPtrArray* scope_path) 
 {
 	SymbolDBEnginePriv *priv;
@@ -154,7 +154,7 @@
 	return final_definition_id;
 }
 
-static inline void
+static GNUC_INLINE void
 sdb_engine_prepare_file_info_sql (SymbolDBEngine *dbe, GString *info_data,
 									GString *join_data, SymExtraInfo sym_info) 
 {
@@ -207,7 +207,7 @@
 	}	
 }
 
-static inline void
+static GNUC_INLINE void
 sdb_engine_prepare_symbol_info_sql (SymbolDBEngine *dbe, GString *info_data,
 									GString *join_data, SymExtraInfo sym_info) 
 {

Modified: trunk/plugins/symbol-db/symbol-db-engine-utils.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine-utils.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-engine-utils.c	Wed Mar  4 22:41:26 2009
@@ -26,24 +26,24 @@
 
 #include <libanjuta/resources.h>
 #include "symbol-db-engine-utils.h"
-
+#include "symbol-db-engine-priv.h"
 
 static GHashTable *pixbufs_hash = NULL;
 
 /*
  * extern declarations 
  */
-extern inline const GdaStatement *
+extern GNUC_INLINE const GdaStatement *
 sdb_engine_get_statement_by_query_id (SymbolDBEngine * dbe, static_query_type query_id);
 
-extern inline const GdaSet *
+extern GNUC_INLINE const GdaSet *
 sdb_engine_get_query_parameters_list (SymbolDBEngine *dbe, static_query_type query_id);
 
-extern inline const DynChildQueryNode *
+extern GNUC_INLINE const DynChildQueryNode *
 sdb_engine_get_dyn_query_node_by_id (SymbolDBEngine *dbe, dyn_query_type query_id,
 									 SymExtraInfo sym_info, gsize other_parameters);
 
-extern inline const DynChildQueryNode *
+extern GNUC_INLINE const DynChildQueryNode *
 sdb_engine_insert_dyn_query_node_by_id (SymbolDBEngine *dbe, dyn_query_type query_id,
 									 	SymExtraInfo sym_info, gsize other_parameters,
 										const gchar *sql);