diff --git a/ChangeLog b/ChangeLog
index 3d55c4670d..f2fb649714 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug  7 18:37:39 2010  Tanaka Akira  <akr@fsij.org>
+
+	* missing/close.c: undef the macro "close" to prevent infinite
+	  recursion.
+
 Sat Aug  7 18:20:41 2010  Tanaka Akira  <akr@fsij.org>
 
 	* ext/pathname/pathname.c (path_lchown): Pathname#lchown translated
diff --git a/missing/close.c b/missing/close.c
index e836bf4906..8dc6928ffd 100644
--- a/missing/close.c
+++ b/missing/close.c
@@ -57,6 +57,7 @@ ruby_close(int s)
 {
     int err = errno;
     errno = 0;
+#undef close
     s = close(s);
     if (errno == ECONNRESET) {
 	errno = 0;