aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--thread_win32.h10
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index baf21d39a2..cb2c23ca86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 7 23:24:44 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread_win32.h: undefine _WIN32 on cygwin. [ruby-dev:30303]
+
Wed Feb 7 22:41:34 2007 Koichi Sasada <ko1@atdot.net>
* eval_intern.h: remove UNSUPPORTED() macro.
diff --git a/thread_win32.h b/thread_win32.h
index c02e406795..5a88fb40f8 100644
--- a/thread_win32.h
+++ b/thread_win32.h
@@ -10,11 +10,15 @@
**********************************************************************/
/* interface */
-#ifndef THREAD_WIN32_H_INCLUDED
-#define THREAD_WIN32_H_INCLUDED
+#ifndef RUBY_THREAD_WIN32_H
+#define RUBY_THREAD_WIN32_H
#include <windows.h>
+# ifdef __CYGWIN__
+# undef _WIN32
+# endif
+
WINBASEAPI BOOL WINAPI
TryEnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection);
@@ -30,5 +34,5 @@ typedef struct native_thread_data_struct {
HANDLE interrupt_event;
} native_thread_data_t;
-#endif /* THREAD_WIN32_H_INCLUDED */
+#endif /* RUBY_THREAD_WIN32_H */