From 7ee5de103efb06e500e00bd649b633cafcfeb54f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 8 Aug 2008 14:27:25 +0000
Subject: * io.c (shutdown): not define if defined already.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 io.c      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c75745040..90557a5da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug  8 23:27:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (shutdown): not define if defined already.
+
 Fri Aug  8 22:47:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_insnhelper.c (opt_eq_func): large function to make inline.
diff --git a/io.c b/io.c
index 380755a59..77b85de9e 100644
--- a/io.c
+++ b/io.c
@@ -199,7 +199,7 @@ static int max_file_descriptor = NOFILE;
 #  endif
 #endif
 
-#ifndef HAVE_SHUTDOWN
+#if !defined HAVE_SHUTDOWN && !defined shutdown
 #define shutdown(a,b)	0
 #endif
 
-- 
cgit