aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2001-12-17 16:13:40 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2001-12-17 16:13:40 +0000
commitf282c7dc7ee4115f84c2e220104f0c7405b93cd4 (patch)
treefc8077c8f2cb0b2a06fb8802b6fdf70291f73143
parent[w3m-dev 02670] (diff)
downloadw3m-f282c7dc7ee4115f84c2e220104f0c7405b93cd4.tar.gz
w3m-f282c7dc7ee4115f84c2e220104f0c7405b93cd4.zip
[#493906] missing #ifdef by Kazuhiro NISHIYAMA (znz)
-rw-r--r--ChangeLog8
-rw-r--r--main.c6
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b8e1a8..ef83ad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-18 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [#493906] missing #ifdef by Kazuhiro NISHIYAMA (znz)
+ * main.c (sig_chld): #ifdef SIGCHLD
+ * main.c (SigAlarm): #ifdef USE_ALARM
+
2001-12-18 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
* [w3m-dev 02670]
@@ -1285,4 +1291,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.135 2001/12/17 16:05:03 ukai Exp $
+$Id: ChangeLog,v 1.136 2001/12/17 16:13:40 ukai Exp $
diff --git a/main.c b/main.c
index 6cb0430..d923bb4 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.37 2001/12/17 15:54:14 ukai Exp $ */
+/* $Id: main.c,v 1.38 2001/12/17 16:13:40 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -207,6 +207,7 @@ wrap_GC_warn_proc(char *msg, GC_word arg)
fprintf(stderr, msg, (unsigned long)arg);
}
+#ifdef SIGCHLD
static void
sig_chld(int signo)
{
@@ -229,6 +230,7 @@ sig_chld(int signo)
signal(SIGCHLD, sig_chld);
return;
}
+#endif
Str
make_optional_header_string(char *s)
@@ -4660,6 +4662,7 @@ SigAlarm(SIGNAL_ARG)
#endif
w3mFuncList[alarm_event.cmd].func();
onA();
+#ifdef USE_ALARM
if (alarm_status == AL_IMPLICIT) {
alarm_buffer = Currentbuf;
alarm_status = AL_IMPLICIT_DONE;
@@ -4672,6 +4675,7 @@ SigAlarm(SIGNAL_ARG)
signal(SIGALRM, SigAlarm);
alarm(alarm_sec);
}
+#endif
}
SIGNAL_RETURN;
}