File xlogmaster-1.6.1-gcc4.diff of Package xlogmaster

diff -ur xlogmaster-orig/src/alert.cc xlogmaster-1.6.0/src/alert.cc
--- xlogmaster-orig/src/alert.cc	1999-03-31 18:00:29.000000000 +0200
+++ xlogmaster-1.6.0/src/alert.cc	2005-05-17 11:58:54.681981508 +0200
@@ -103,7 +103,7 @@
 int 
 alert_interrupt(gpointer data)
 { 
-  int nr = (int) data;
+  int nr = GPOINTER_TO_INT(data);
   entry[nr]->fade += entry[nr]->fadestep;
   if ( entry[nr]->fade > fade_base )
     {
diff -ur xlogmaster-orig/src/customize.cc xlogmaster-1.6.0/src/customize.cc
--- xlogmaster-orig/src/customize.cc	1999-03-31 18:00:29.000000000 +0200
+++ xlogmaster-1.6.0/src/customize.cc	2005-05-17 12:02:40.659708996 +0200
@@ -1849,7 +1849,7 @@
 
   gint default_class0_filter = NO_FILTER;
   if ( data != NULL )
-    default_class0_filter = (gint) data;
+    default_class0_filter = GPOINTER_TO_INT(data);
 
   /* block handlers */
   block_filter_handlers = TRUE;  
diff -ur xlogmaster-orig/src/output.cc xlogmaster-1.6.0/src/output.cc
--- xlogmaster-orig/src/output.cc	1999-03-31 18:00:29.000000000 +0200
+++ xlogmaster-1.6.0/src/output.cc	2005-05-17 12:30:21.271980620 +0200
@@ -187,7 +187,7 @@
 gint 
 pipe_magic_interrupt(gpointer data)
 {
-  gint i = (gint) data;
+  gint i = GPOINTER_TO_INT(data);
   
   /* are we locked out ? */
   if ( entry[i]->pipe_lock == TRUE )
diff -ur xlogmaster-orig/src/watchdog.cc xlogmaster-1.6.0/src/watchdog.cc
--- xlogmaster-orig/src/watchdog.cc	1999-03-31 18:00:29.000000000 +0200
+++ xlogmaster-1.6.0/src/watchdog.cc	2005-05-17 12:27:52.820334893 +0200
@@ -753,7 +753,7 @@
 gint 
 watchdog_tail_interrupt(gpointer data)
 {
-  gint i = (gint) data;
+  gint i = GPOINTER_TO_INT(data);
   if ( entry[i]->active == FALSE ) return TRUE;
   
   if ( entry[i]->fd == -1 )
@@ -893,7 +893,7 @@
 gint 
 watchdog_run_interrupt(gpointer data)
 {
-  int i = (int) data;
+  int i = GPOINTER_TO_INT(data);
   if ( entry[i]->active == FALSE ) return TRUE;
 
   if ( entry[i]->fd == -1 )
@@ -1004,7 +1004,7 @@
 gint
 watchdog_run_restart_interrupt(gpointer data)
 { 
-  gint i = (gint) data;
+  gint i = GPOINTER_TO_INT(data);
   
   /* first remove this interrupt */
   gtk_timeout_remove(entry[i]->tag);
@@ -1036,7 +1036,7 @@
 gint 
 watchdog_cat_interrupt(gpointer data)
 {
-  int i = (int) data;
+  int i = GPOINTER_TO_INT(data);
   if ( entry[i]->active == FALSE ) return TRUE;
   
   /* we need to open it every time anew for CAT */
@@ -1582,7 +1582,7 @@
 gint 
 tail_interrupt(gpointer data)
 { 
-  gint i = (gint) data;
+  gint i = GPOINTER_TO_INT(data);
   if ( entry[i]->active == FALSE ) return TRUE;
   
   /*
@@ -1694,7 +1694,7 @@
 gint 
 cat_interrupt(gpointer data)
 {
-  gint i = (gint) data;
+  gint i = GPOINTER_TO_INT(data);
   if ( entry[i]->active == FALSE ) return TRUE;
   
   entry[i]->fd = open(entry[i]->filename, O_RDONLY);
@@ -1723,7 +1723,7 @@
 gint 
 run_interrupt(gpointer data)
 { 
-  gint i = (gint) data;
+  gint i = GPOINTER_TO_INT(data);
   if ( entry[i]->active == FALSE ) return TRUE;
 
   long got = read_from_filedescriptor(i);
@@ -1785,7 +1785,7 @@
 gint 
 run_restart_interrupt(gpointer data)
 { 
-  gint i = (gint) data;
+  gint i = GPOINTER_TO_INT(data);
  
   /* first remove this interrupt */
   gtk_timeout_remove(entry[i]->tag);
diff -ur xlogmaster-orig/src/xlogmaster.cc xlogmaster-1.6.0/src/xlogmaster.cc
--- xlogmaster-orig/src/xlogmaster.cc	1999-03-31 18:00:29.000000000 +0200
+++ xlogmaster-1.6.0/src/xlogmaster.cc	2005-05-17 11:54:47.683604992 +0200
@@ -434,7 +434,7 @@
 button_pressed(GtkWidget *, gpointer *data)
 {
   if ( display_logs == DISABLED ) return;
-  int pressed = (int) data;       // Which button has been pressed ?
+  int pressed = GPOINTER_TO_INT(data);       // Which button has been pressed ?
   deactivate();                        // deactivate old "Log" object
   active = pressed;                 // set new one
   activate();                           // and activate it