aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--main.c8
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b54a9d..2d71116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-19 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * main.c (DefaultAlarm): fix initialize value
+
2002-12-19 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03578] meta refresh
@@ -5922,4 +5926,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.628 2002/12/18 16:20:49 ukai Exp $
+$Id: ChangeLog,v 1.629 2002/12/18 16:25:47 ukai Exp $
diff --git a/main.c b/main.c
index f85d4c3..d163cee 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.171 2002/12/18 16:20:53 ukai Exp $ */
+/* $Id: main.c,v 1.172 2002/12/18 16:25:47 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -43,7 +43,7 @@ static int n_event_queue;
#ifdef USE_ALARM
static AlarmEvent DefaultAlarm = {
- 0, FUNCNAME_nulcmd, NULL, AL_UNSET,
+ 0, AL_UNSET, FUNCNAME_nulcmd, NULL
};
static AlarmEvent *CurrentAlarm = &DefaultAlarm;
static MySignalHandler SigAlarm(SIGNAL_ARG);
@@ -5511,7 +5511,7 @@ SigAlarm(SIGNAL_ARG)
#endif
CurrentCmdData = NULL;
if (CurrentAlarm->status == AL_IMPLICIT_ONCE) {
- CurrentAlarm->sec = 0;
+ CurrentAlarm->sec = 0;
CurrentAlarm->status = AL_UNSET;
}
if (CurrentAlarm->sec > 0) {
@@ -5555,7 +5555,7 @@ setAlarm(void)
}
AlarmEvent *
-setAlarmEvent(AlarmEvent *event, int sec, short status, int cmd, void *data)
+setAlarmEvent(AlarmEvent * event, int sec, short status, int cmd, void *data)
{
if (event == NULL)
event = New(AlarmEvent);