summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles.Forsyth <devnull@localhost>2008-11-03 06:22:00 +0000
committerCharles.Forsyth <devnull@localhost>2008-11-03 06:22:00 +0000
commit789babf1e4e327e47fe013ee96214f246977321b (patch)
tree8e2e7c755ba829e944888438eb4a7eae08751212
parent9fa4e08855c41e6c4cee680b463f595549f5dae2 (diff)
20081103-0621
-rw-r--r--emu/Linux/os.c4
-rw-r--r--include/version.h2
-rw-r--r--man/2/timers2
3 files changed, 6 insertions, 2 deletions
diff --git a/emu/Linux/os.c b/emu/Linux/os.c
index c6a0b559..49aec7e5 100644
--- a/emu/Linux/os.c
+++ b/emu/Linux/os.c
@@ -16,6 +16,10 @@
#include <sys/syscall.h>
#define getpid() syscall(SYS_getpid)
+/* temporarily suppress CLONE_PTRACE so it works on broken Linux kernels */
+#undef CLONE_PTRACE
+#define CLONE_PTRACE 0
+
enum
{
DELETE = 0x7f,
diff --git a/include/version.h b/include/version.h
index 3baa45ad..e8d10b98 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20081030)"
+#define VERSION "Fourth Edition (20081103)"
diff --git a/man/2/timers b/man/2/timers
index 4e1c8f52..da1d4ad8 100644
--- a/man/2/timers
+++ b/man/2/timers
@@ -69,7 +69,7 @@ value times a single interval.
When a timer
.I t
expires, the timing process attempts, at that and each subsequent timing interval, to send on
-.IB t .channel
+.IB t .timeout
until the expiry message is delivered or the timer is stopped.
.SH EXAMPLE
Wait for data to be sent on an input channel, but give up if it does not arrive within 600 milliseconds: