From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Sat, 14 Aug 2004 16:46:51 +0000 (+0000)
Subject: fix __inline -> __inline__
X-Git-Tag: v0.12.20~2743
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=31b6868d56b0ea3311daa05301e53ac7e00ca218;p=lttv.git

fix __inline -> __inline__

git-svn-id: http://ltt.polymtl.ca/svn@746 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/ltt/branches/poly/lttv/lttv/attribute.c b/ltt/branches/poly/lttv/lttv/attribute.c
index 54985867..081265c7 100644
--- a/ltt/branches/poly/lttv/lttv/attribute.c
+++ b/ltt/branches/poly/lttv/lttv/attribute.c
@@ -41,8 +41,8 @@ typedef struct _Attribute {
 } Attribute;
 
 
-static __inline LttvAttributeValue address_of_value(LttvAttributeType t,
-                                                    AttributeValue *v)
+static __inline__ LttvAttributeValue address_of_value(LttvAttributeType t,
+                                                      AttributeValue *v)
 {
   LttvAttributeValue va;
 
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
index 01189e55..e2977da8 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
@@ -211,13 +211,13 @@ guicontrolflow_destructor(ControlFlowData *control_flow_data)
  
 }
 
-__inline GtkWidget *guicontrolflow_get_widget(
+__inline__ GtkWidget *guicontrolflow_get_widget(
                                      ControlFlowData *control_flow_data)
 {
   return control_flow_data->top_widget ;
 }
 
-__inline ProcessList *guicontrolflow_get_process_list
+__inline__ ProcessList *guicontrolflow_get_process_list
     (ControlFlowData *control_flow_data)
 {
     return control_flow_data->process_list ;
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h
index 35119ab3..1c171758 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h
@@ -33,9 +33,9 @@ void
 guicontrolflow_destructor_full(ControlFlowData *control_flow_data);
 void
 guicontrolflow_destructor(ControlFlowData *control_flow_data);
-__inline GtkWidget *guicontrolflow_get_widget(
+__inline__ GtkWidget *guicontrolflow_get_widget(
                                        ControlFlowData *control_flow_data);
-__inline ProcessList *guicontrolflow_get_process_list(
+__inline__ ProcessList *guicontrolflow_get_process_list(
                                        ControlFlowData *control_flow_data);
 
 
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
index 53f21422..bcda5b22 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -923,7 +923,7 @@ GtkWidget *drawing_get_widget(Drawing_t *drawing)
  *
  * Convert from window pixel and time interval to an absolute time.
  */
-__inline void convert_pixels_to_time(
+__inline__ void convert_pixels_to_time(
     gint width,
     guint x,
     TimeWindow time_window,
@@ -938,7 +938,7 @@ __inline void convert_pixels_to_time(
 }
 
 
-__inline void convert_time_to_pixels(
+__inline__ void convert_time_to_pixels(
     TimeWindow time_window,
     LttTime time,
     int width,
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h
index 69840a1a..6cbcb848 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h
@@ -134,13 +134,13 @@ void drawing_remove_square(Drawing_t *drawing,
         guint y,
         guint height);
 
-__inline void convert_pixels_to_time(
+__inline__ void convert_pixels_to_time(
     gint width,
     guint x,
     TimeWindow time_window,
     LttTime *time);
 
-__inline void convert_time_to_pixels(
+__inline__ void convert_time_to_pixels(
     TimeWindow time_window,
     LttTime time,
     gint width,
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
index f7dd664b..c71aeebe 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
@@ -111,7 +111,7 @@
 #define MAX_PATH_LEN 256
 
 /* drawing hook functions */
-__inline gboolean draw_text( void *hook_data, void *call_data)
+__inline__ gboolean draw_text( void *hook_data, void *call_data)
 {
   PropertiesText *properties = (PropertiesText*)hook_data;
   DrawContext *draw_context = (DrawContext*)call_data;
@@ -206,7 +206,7 @@ __inline gboolean draw_text( void *hook_data, void *call_data)
 /* To speed up the process, search in already loaded icons list first. Only
  * load it if not present.
  */
-__inline gboolean draw_icon( void *hook_data, void *call_data)
+__inline__ gboolean draw_icon( void *hook_data, void *call_data)
 {
   PropertiesIcon *properties = (PropertiesIcon*)hook_data;
   DrawContext *draw_context = (DrawContext*)call_data;
@@ -311,7 +311,7 @@ __inline gboolean draw_icon( void *hook_data, void *call_data)
   return 0;
 }
 
-__inline gboolean draw_line( void *hook_data, void *call_data)
+__inline__ gboolean draw_line( void *hook_data, void *call_data)
 {
   PropertiesLine *properties = (PropertiesLine*)hook_data;
   DrawContext *draw_context = (DrawContext*)call_data;
@@ -357,7 +357,7 @@ __inline gboolean draw_line( void *hook_data, void *call_data)
   return 0;
 }
 
-__inline gboolean draw_arc( void *hook_data, void *call_data)
+__inline__ gboolean draw_arc( void *hook_data, void *call_data)
 {
   PropertiesArc *properties = (PropertiesArc*)hook_data;
   DrawContext *draw_context = (DrawContext*)call_data;
@@ -433,7 +433,7 @@ __inline gboolean draw_arc( void *hook_data, void *call_data)
   return 0;
 }
 
-__inline gboolean draw_bg( void *hook_data, void *call_data)
+__inline__ gboolean draw_bg( void *hook_data, void *call_data)
 {
   PropertiesBG *properties = (PropertiesBG*)hook_data;
   DrawContext *draw_context = (DrawContext*)call_data;
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.h b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.h
index 85fc837a..434f2007 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.h
@@ -268,11 +268,11 @@ void exec_operations( LttvIAttribute *attributes,
  * different items.
  */
 
-__inline gboolean draw_text( void *hook_data, void *call_data);
-__inline gboolean draw_icon( void *hook_data, void *call_data);
-__inline gboolean draw_line( void *hook_data, void *call_data);
-__inline gboolean draw_arc( void *hook_data, void *call_data);
-__inline gboolean draw_bg( void *hook_data, void *call_data);
+__inline__ gboolean draw_text( void *hook_data, void *call_data);
+__inline__ gboolean draw_icon( void *hook_data, void *call_data);
+__inline__ gboolean draw_line( void *hook_data, void *call_data);
+__inline__ gboolean draw_arc( void *hook_data, void *call_data);
+__inline__ gboolean draw_bg( void *hook_data, void *call_data);
 
 
 #endif // _DRAW_ITEM_H
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
index be23d1e3..d080a2c1 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -271,7 +271,7 @@ int event_selected_hook(void *hook_data, void *call_data)
 }
 
 /* Function that selects the color of status&exemode line */
-static __inline PropertiesLine prepare_s_e_line(LttvProcessState *process)
+static __inline__ PropertiesLine prepare_s_e_line(LttvProcessState *process)
 {
   PropertiesLine prop_line;
   prop_line.line_width = 2;
@@ -318,7 +318,7 @@ static __inline PropertiesLine prepare_s_e_line(LttvProcessState *process)
 }
 
 #if 0
-static __inline PropertiesLine prepare_status_line(LttvProcessState *process)
+static __inline__ PropertiesLine prepare_status_line(LttvProcessState *process)
 {
   PropertiesLine prop_line;
   prop_line.line_width = 2;
@@ -1913,7 +1913,7 @@ int after_schedchange_hook(void *hook_data, void *call_data)
 }
 
 #if 0
-static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process)
+static __inline__ PropertiesLine prepare_execmode_line(LttvProcessState *process)
 {
   PropertiesLine prop_line;
   prop_line.line_width = 1;
@@ -3080,8 +3080,9 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
      * draw items from the beginning of the read for it. If it is not
      * present, it's a new process and it was not present : it will
      * be added after the state update.  */
+#ifdef EXTRA_CHECK
     g_assert(lttv_traceset_number(tsc->ts) > 0);
-
+#endif //EXTRA_CHECK
     /* tracefiles[0] is ok here, because we draw for every PID, and
      * assume CPU 0 for PID 0 //FIXME */
     LttvTracefileState *tfs =
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
index 33c497f8..11b838a1 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
@@ -32,7 +32,7 @@
  *                       Methods to synchronize process list                 *
  *****************************************************************************/
 
-static __inline guint get_cpu_number_from_name(GQuark name);
+static __inline__ guint get_cpu_number_from_name(GQuark name);
   
 /* Enumeration of the columns */
 enum
@@ -443,7 +443,7 @@ GtkWidget *processlist_get_widget(ProcessList *process_list)
 
 
 
-static __inline gint get_cell_height(ProcessList *process_list, GtkTreeView *tree_view)
+static __inline__ gint get_cell_height(ProcessList *process_list, GtkTreeView *tree_view)
 {
   gint height = process_list->cell_height_cache;
   if(height != -1) return height;
@@ -593,7 +593,7 @@ int processlist_remove( ProcessList *process_list,
 }
 
 
-guint processlist_get_height(ProcessList *process_list)
+__inline__ guint processlist_get_height(ProcessList *process_list)
 {
   return get_cell_height(process_list,
                          (GtkTreeView*)process_list->process_list_widget)
@@ -601,7 +601,7 @@ guint processlist_get_height(ProcessList *process_list)
 }
 
 
-__inline gint processlist_get_process_pixels(  ProcessList *process_list,
+__inline__ gint processlist_get_process_pixels(  ProcessList *process_list,
           guint pid, guint cpu, LttTime *birth, guint trace_num,
           guint *y,
           guint *height,
@@ -645,7 +645,7 @@ __inline gint processlist_get_process_pixels(  ProcessList *process_list,
 }
 
 
-__inline gint processlist_get_pixels_from_data(  ProcessList *process_list,
+__inline__ gint processlist_get_pixels_from_data(  ProcessList *process_list,
           ProcessInfo *process_info,
           HashedProcessData *hashed_process_data,
           guint *y,
@@ -667,7 +667,7 @@ __inline gint processlist_get_pixels_from_data(  ProcessList *process_list,
 
 }
 
-static __inline guint get_cpu_number_from_name(GQuark name)
+static __inline__ guint get_cpu_number_from_name(GQuark name)
 {
   const gchar *string;
   char *begin;
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h
index 7a2f4828..c1fccc3e 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.h
@@ -113,15 +113,15 @@ int processlist_add(ProcessList *process_list, guint pid, guint cpu, guint ppid,
 int processlist_remove(ProcessList *process_list, guint pid, guint cpu, 
     LttTime *birth, guint trace_num);
 
-guint processlist_get_height(ProcessList *process_list);
+__inline__ guint processlist_get_height(ProcessList *process_list);
 
 // Returns 0 on success
-__inline gint processlist_get_process_pixels(ProcessList *process_list,
+__inline__ gint processlist_get_process_pixels(ProcessList *process_list,
         guint pid, guint cpu, LttTime *birth, guint trace_num,
         guint *y, guint *height,
         HashedProcessData **hashed_process_data);
 
-__inline gint processlist_get_pixels_from_data(  ProcessList *process_list,
+__inline__ gint processlist_get_pixels_from_data(  ProcessList *process_list,
           ProcessInfo *process_info,
           HashedProcessData *hashed_process_data,
           guint *y,
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
index e0700de2..10bc10c3 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
@@ -916,7 +916,7 @@ void lttvwindow_events_request_remove_all(Tab       *tab,
  * @return time window.
  */
 
-__inline TimeWindow lttvwindow_get_time_window(Tab *tab)
+__inline__ TimeWindow lttvwindow_get_time_window(Tab *tab)
 {
   return tab->time_window;
   
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h
index 85ecb29c..790dcf50 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.h
@@ -664,7 +664,7 @@ void lttvwindow_events_request_remove_all(Tab            *tab,
  * @return the current tab's time interval.
  */
 
-__inline TimeWindow lttvwindow_get_time_window(Tab *tab);
+__inline__ TimeWindow lttvwindow_get_time_window(Tab *tab);
 
 
 /**