diff --git a/ChangeLog b/ChangeLog
index 85b10bd3d4..25dde798db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 11 22:18:23 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dir.c, file.c (lstat): avoid warnings for mingw.
+
 Mon Apr 11 20:11:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV when exit
diff --git a/dir.c b/dir.c
index b516ef2752..5289585ef0 100644
--- a/dir.c
+++ b/dir.c
@@ -63,8 +63,8 @@ char *strchr _((char*,char));
 
 #include "util.h"
 
-#ifndef HAVE_LSTAT
-#define lstat(path,st) stat(path,st)
+#if !defined HAVE_LSTAT && !defined lstat
+#define lstat stat
 #endif
 
 #define FNM_NOESCAPE	0x01
diff --git a/file.c b/file.c
index 798615669f..94136e7b72 100644
--- a/file.c
+++ b/file.c
@@ -64,8 +64,8 @@ char *strrchr _((const char*,const char));
 #include <sys/mkdev.h>
 #endif
 
-#ifndef HAVE_LSTAT
-#define lstat(path,st) stat(path,st)
+#if !defined HAVE_LSTAT && !defined lstat
+#define lstat stat
 #endif
 
 VALUE rb_cFile;