diff --git a/ChangeLog b/ChangeLog
index da6424f6f9..8633de1ec5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 28 23:59:31 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (struct thread): declare win32_exception_list on cygwin and
+	  win32 regardless if it is implemented.  Provisional fix for
+	  [ruby-core:08917].
+
 Thu Sep 28 20:53:16 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/tmpdir.rb: use return value of getdir.call for length.
diff --git a/node.h b/node.h
index 06678a4010..ec0a6f4fe8 100644
--- a/node.h
+++ b/node.h
@@ -402,8 +402,8 @@ typedef struct thread * rb_thread_t;
 struct thread {
     struct thread *next, *prev;
     rb_jmpbuf_t context;
-#ifdef SAVE_WIN32_EXCEPTION_LIST
-    DWORD win32_exception_list;
+#if (defined _WIN32 && !defined _WIN32_WCE) || defined __CYGWIN__
+    unsigned long win32_exception_list;
 #endif
 
     VALUE result;