From 42f50cf40c26f749deec6637e9ed3c6428f0b29f Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Fri, 20 Nov 1998 02:03:57 +0000 Subject: [PATCH] nsTimerExpired should be a C function that returns a gint (i.e. a GtkFunction) which returns 0 on success --- base/src/gtk/nsTimer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/src/gtk/nsTimer.cpp b/base/src/gtk/nsTimer.cpp index 9d6dc77e6164..df2fdda05f47 100644 --- a/base/src/gtk/nsTimer.cpp +++ b/base/src/gtk/nsTimer.cpp @@ -25,7 +25,7 @@ static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID); -extern void nsTimerExpired(gpointer aCallData); +extern "C" gint nsTimerExpired(gpointer aCallData); /* * Implementation of timers using Gtk timer facility @@ -79,7 +79,7 @@ void TimerImpl::FireTimeout() // Always repeating here // if (mRepeat) -// mTimerId = gtk_timeout_add(aDelay, (GtkFunction)nsTimerExpired, this); +// mTimerId = gtk_timeout_add(aDelay, nsTimerExpired, this); } @@ -108,7 +108,7 @@ TimerImpl::Init(nsTimerCallbackFunc aFunc, mClosure = aClosure; // mRepeat = aRepeat; - mTimerId = gtk_timeout_add(aDelay, (GtkFunction)nsTimerExpired, this); + mTimerId = gtk_timeout_add(aDelay, nsTimerExpired, this); return Init(aDelay); } @@ -121,7 +121,7 @@ TimerImpl::Init(nsITimerCallback *aCallback, mCallback = aCallback; // mRepeat = aRepeat; - mTimerId = gtk_timeout_add(aDelay, (GtkFunction)nsTimerExpired, this); + mTimerId = gtk_timeout_add(aDelay, nsTimerExpired, this); return Init(aDelay); } @@ -159,9 +159,9 @@ NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult) return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult); } - -void nsTimerExpired(gpointer aCallData) +gint nsTimerExpired(gpointer aCallData) { TimerImpl* timer = (TimerImpl *)aCallData; timer->FireTimeout(); + return 0; }