From 90ca8317d37d3f649e9ec52ce01b1003194c70ac Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 8 Aug 2008 14:27:25 +0000 Subject: [PATCH] * io.c (shutdown): not define if defined already. git-svn-id: svn+ssh://ci.ruby-lang.org/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 c757450403..90557a5da0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Aug 8 23:27:03 2008 Nobuyoshi Nakada + + * io.c (shutdown): not define if defined already. + Fri Aug 8 22:47:26 2008 Nobuyoshi Nakada * vm_insnhelper.c (opt_eq_func): large function to make inline. diff --git a/io.c b/io.c index 380755a599..77b85de9e3 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