final inline compile fixes

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

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
index 89050810e375da62eb44c3553f52e76277366c0b..7b4dc2736313ff642b531a5e1db6e42320273354 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
@@ -34,7 +34,7 @@ libguicontrolflow_la_LDFLAGS = -module
 libguicontrolflow_la_SOURCES =         module.c eventhooks.c cfv.c processlist.c\
                                drawing.c drawitem.c
 
-noinst_HEADERS =       eventhooks.h cfv.h cfv-private.h processlist.h\
+noinst_HEADERS =       eventhooks.h cfv.h processlist.h\
                                drawing.h drawitem.h
 
 EXTRA_DIST = \

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
index 8d4a339ec2b47ff25bc3fd2045f0fb3ac6cada1b..ce77e4d5ecf936245cccc31e24e68d90735ce777 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.c
@@ -24,7 +24,6 @@
 #include "drawing.h"
 #include "processlist.h"
 #include "eventhooks.h"
-#include "cfv-private.h"
 #include <lttv/lttv.h>
 
 extern GSList *g_control_flow_data_list;

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h
index 0d2ca3323a58c0be78f6caa799f4f7773060525b..d9a144021789409876bb5b8f8a5ad7bbc953068c 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h
@@ -26,6 +26,16 @@
 #include "processlist.h"
 
 
+#ifndef TYPE_DRAWING_T_DEFINED
+#define TYPE_DRAWING_T_DEFINED
+typedef struct _Drawing_t Drawing_t;
+#endif //TYPE_DRAWING_T_DEFINED
+
+#ifndef TYPE_CONTROLFLOWDATA_DEFINED
+#define TYPE_CONTROLFLOWDATA_DEFINED
+typedef struct _ControlFlowData ControlFlowData;
+#endif //TYPE_CONTROLFLOWDATA_DEFINED
+
 struct _ControlFlowData {
 
   GtkWidget *top_widget;
@@ -51,10 +61,6 @@ struct _ControlFlowData {
 } ;
 
 
-
-
-typedef struct _ControlFlowData ControlFlowData;
-
 /* Control Flow Data constructor */
 ControlFlowData *guicontrolflow(void);
 void

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
index d94a509ef5e383afcba712c80e273efa659d80b5..3fdfdcc163307481ec9973365840fb983464250c 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -29,7 +29,6 @@
 #include "drawing.h"
 #include "eventhooks.h"
 #include "cfv.h"
-#include "cfv-private.h"
 
 #define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
 #define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h
index ce058111846e9ed9d9edc0a5f15b76dee3150955..05114beea86e95cb4b50dbf4d60d24e6962b911e 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.h
@@ -73,7 +73,15 @@ extern GdkColor drawing_colors[NUM_COLORS];
  * of the shown processes.
  */
 
+#ifndef TYPE_DRAWING_T_DEFINED
+#define TYPE_DRAWING_T_DEFINED
 typedef struct _Drawing_t Drawing_t;
+#endif //TYPE_DRAWING_T_DEFINED
+
+#ifndef TYPE_CONTROLFLOWDATA_DEFINED
+#define TYPE_CONTROLFLOWDATA_DEFINED
+typedef struct _ControlFlowData ControlFlowData;
+#endif //TYPE_CONTROLFLOWDATA_DEFINED
 
 struct _Drawing_t {
   GtkWidget *vbox;

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
index 14ae53593982d15f5bd782a12ec8e63b11828b92..7f350aeddc6b1d695af5dd3853c1d6e2c205fed3 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -71,7 +71,6 @@
 #include "cfv.h"
 #include "processlist.h"
 #include "drawing.h"
-#include "cfv-private.h"
 
 
 #define MAX_PATH_LEN 256

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
index 644cce52c8cc87cb61e1f515f2ad804f64377155..93e730aeae5e20ee3772b22d93d0aaeaa58b919e 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/processlist.c
@@ -441,22 +441,6 @@ GtkWidget *processlist_get_widget(ProcessList *process_list)
 }
 
 
-
-static inline gint get_cell_height(ProcessList *process_list, GtkTreeView *tree_view)
-{
-  gint height = process_list->cell_height_cache;
-  if(height != -1) return height;
-  else {
-    GtkTreeViewColumn *Column = gtk_tree_view_get_column(tree_view, 0);
-  
-    gtk_tree_view_column_cell_get_size(Column, NULL, NULL, NULL, NULL,
-                                       &process_list->cell_height_cache);
-  }
-    
-  
-  return process_list->cell_height_cache;
-}
-
 void destroy_hash_key(gpointer key)
 {
   g_free(key);