Fix build on 64bit platforms

This commit is contained in:
Tilman Keskinoz 2007-08-12 17:17:18 +00:00
parent d967ce5cd9
commit 7d114c392d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=197535
5 changed files with 118 additions and 0 deletions

View file

@ -0,0 +1,11 @@
--- alert.cc.org 2007-07-16 14:54:21.000000000 +0200
+++ src/alert.cc 2007-07-16 14:54:48.000000000 +0200
@@ -102,7 +102,7 @@
int
alert_interrupt(gpointer data)
{
- int nr = (int) data;
+ long nr = (long) data;
entry[nr]->fade += entry[nr]->fadestep;
if ( entry[nr]->fade > fade_base )
{

View file

@ -0,0 +1,11 @@
--- src/customize.cc.orig 2007-08-12 19:09:06.000000000 +0200
+++ src/customize.cc 2007-08-12 19:09:28.000000000 +0200
@@ -1847,7 +1847,7 @@
gint default_class0_filter = NO_FILTER;
if ( data != NULL )
- default_class0_filter = (gint) data;
+ default_class0_filter = (glong) data;
/* block handlers */
block_filter_handlers = TRUE;

View file

@ -0,0 +1,11 @@
--- src/output.cc.orig 2007-08-12 19:13:18.000000000 +0200
+++ src/output.cc 2007-08-12 19:13:42.000000000 +0200
@@ -187,7 +187,7 @@
gint
pipe_magic_interrupt(gpointer data)
{
- gint i = (gint) data;
+ glong i = (glong) data;
/* are we locked out ? */
if ( entry[i]->pipe_lock == TRUE )

View file

@ -0,0 +1,74 @@
--- src/watchdog.cc.orig 2007-08-12 19:09:53.000000000 +0200
+++ src/watchdog.cc 2007-08-12 19:12:50.000000000 +0200
@@ -753,7 +753,7 @@
gint
watchdog_tail_interrupt(gpointer data)
{
- gint i = (gint) data;
+ glong i = (glong) 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;
+ intptr_t i = (intptr_t) 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;
+ glong i = (glong) 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;
+ intptr_t i = (intptr_t) 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;
+ glong i = (glong) data;
if ( entry[i]->active == FALSE ) return TRUE;
/*
@@ -1694,7 +1694,7 @@
gint
cat_interrupt(gpointer data)
{
- gint i = (gint) data;
+ glong i = (glong) 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;
+ glong i = (glong) 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;
+ glong i = (glong) data;
/* first remove this interrupt */
gtk_timeout_remove(entry[i]->tag);

View file

@ -0,0 +1,11 @@
--- src/xlogmaster.cc.bak 2005-09-15 06:01:00.000000000 +0200
+++ src/xlogmaster.cc 2007-07-16 14:53:37.000000000 +0200
@@ -433,7 +433,7 @@
button_pressed(GtkWidget *, gpointer *data)
{
if ( display_logs == DISABLED ) return;
- int pressed = (int) data; // Which button has been pressed ?
+ long pressed = (long) data; // Which button has been pressed ?
deactivate(); // deactivate old "Log" object
active = pressed; // set new one
activate(); // and activate it