From e8d11122b46e7e2922e65825623c760f84a4d34f Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Sat, 14 Aug 2004 21:28:45 +0000
Subject: [PATCH] final inline compile fixes

git-svn-id: http://ltt.polymtl.ca/svn@762 04897980-b3bd-0310-b5e0-8ef037075253
---
 .../lttv/modules/gui/controlflow/Makefile.am     |  2 +-
 .../poly/lttv/modules/gui/controlflow/cfv.c      |  1 -
 .../poly/lttv/modules/gui/controlflow/cfv.h      | 14 ++++++++++----
 .../poly/lttv/modules/gui/controlflow/drawing.c  |  1 -
 .../poly/lttv/modules/gui/controlflow/drawing.h  |  8 ++++++++
 .../lttv/modules/gui/controlflow/eventhooks.c    |  1 -
 .../lttv/modules/gui/controlflow/processlist.c   | 16 ----------------
 7 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
index 89050810..7b4dc273 100644
--- 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 8d4a339e..ce77e4d5 100644
--- 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 0d2ca332..d9a14402 100644
--- 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 d94a509e..3fdfdcc1 100644
--- 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 ce058111..05114bee 100644
--- 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 14ae5359..7f350aed 100644
--- 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 644cce52..93e730ae 100644
--- 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);
-- 
2.34.1