2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c489266c04..4948d26b3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov  9 00:26:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (GetLastError): already defined in windows.h on nowadays
+	  cygwin, and caused the confliction with the system provided
+	  definition on cygwin64.  by @kou1okada [Fixes GH-433].
+
 Fri Nov  8 18:35:31 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
 	* lib/open3.rb: receive arguments as keyword arguments.
diff --git a/file.c b/file.c
index 8b74369d21..b14f42e1f8 100644
--- a/file.c
+++ b/file.c
@@ -4302,7 +4302,6 @@ rb_file_truncate(VALUE obj, VALUE len)
 
 #ifdef __CYGWIN__
 #include <winerror.h>
-extern unsigned long __attribute__((stdcall)) GetLastError(void);
 #endif
 
 static VALUE