From a1ed503080dc445df997771802a56f67fd3bb0d8 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Thu, 26 Aug 2010 16:17:24 +0200
Subject: [PATCH] Don't report error when thread->kill() is used on the main
thread.
Rev: src/main.c:1.242
---
src/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main.c b/src/main.c
index 6502c5edf6..fa80874e4d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,7 +2,7 @@
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
-|| $Id: main.c,v 1.241 2010/06/23 16:22:54 grubba Exp $
+|| $Id: main.c,v 1.242 2010/08/26 14:17:24 mast Exp $
*/
#include "global.h"
@@ -617,7 +617,7 @@ int main(int argc, char **argv)
if(SETJMP(back))
{
- if(throw_severity == THROW_EXIT)
+ if(throw_severity == THROW_EXIT || throw_severity == THROW_THREAD_EXIT)
{
num=throw_value.u.integer;
}else{
--
GitLab