aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-29 00:05:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-29 00:05:11 +0000
commit2fd8753bde9c7c190cbd91adfb331da4f13e932d (patch)
tree41faf0d07149e8fe66121ee0f72455a2bed5f469
parent27295f104a348d914815566f08bf9a57f72cf77c (diff)
downloadruby-2fd8753bde9c7c190cbd91adfb331da4f13e932d.tar.gz
* thread_pthread.h: no Structured Exception Handling like macros.
[ruby-core:40432] [Bug #5491] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread_pthread.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 202ac7e1a0..600ca03f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 29 09:05:07 2011 Nobuyoshi Nakada <>
+
+ * thread_pthread.h: no Structured Exception Handling like macros.
+ [ruby-core:40432] [Bug #5491]
+
Fri Oct 28 22:05:34 2011 Tanaka Akira <akr@fsij.org>
* ext/sdbm/_sdbm.c: RCS $Id$ removed.
diff --git a/thread_pthread.h b/thread_pthread.h
index f180a79d27..b3e7c36cf0 100644
--- a/thread_pthread.h
+++ b/thread_pthread.h
@@ -32,6 +32,11 @@ typedef struct native_thread_data_struct {
#include <semaphore.h>
+#undef except
+#undef try
+#undef leave
+#undef finally
+
typedef struct rb_global_vm_lock_struct {
/* fast path */
unsigned long acquired;