From f6404fa6d58927e28fb24f3f66b5e3b3c5c1b0c9 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 7 Aug 2010 08:49:18 +0000
Subject: * include/ruby/missing.h: moved BROKEN_CLOSE replacements from  
 include/ruby/ruby.h.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 include/ruby/missing.h |  8 ++++++++
 include/ruby/ruby.h    | 11 -----------
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index abbd2bf870..d884d382ff 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -191,6 +191,14 @@ RUBY_EXTERN int ruby_getpeername(int, struct sockaddr *, socklen_t *);
 RUBY_EXTERN int ruby_getsockname(int, struct sockaddr *, socklen_t *);
 RUBY_EXTERN int ruby_shutdown(int, int);
 RUBY_EXTERN int ruby_close(int);
+#undef getpeername
+#define getpeername ruby_getpeername
+#undef getsockname
+#define getsockname ruby_getsockname
+#undef shutdown
+#define shutdown ruby_shutdown
+#undef close
+#define close ruby_close
 #endif
 
 #if defined __GNUC__ && __GNUC__ >= 4
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 576e4cd23c..83f68ec083 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1438,17 +1438,6 @@ int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
 #define snprintf ruby_snprintf
 #define vsnprintf ruby_vsnprintf
 
-#ifdef BROKEN_CLOSE
-#undef getpeername
-#define getpeername ruby_getpeername
-#undef getsockname
-#define getsockname ruby_getsockname
-#undef shutdown
-#define shutdown ruby_shutdown
-#undef close
-#define close ruby_close
-#endif
-
 #if defined __GNUC__ && __GNUC__ >= 4
 #pragma GCC visibility pop
 #endif
-- 
cgit v1.2.3