summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/missing.h8
-rw-r--r--include/ruby/ruby.h11
3 files changed, 13 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index df763639788..f096ad72a1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 7 17:49:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/missing.h: moved BROKEN_CLOSE replacements from
+ include/ruby/ruby.h.
+
Sat Aug 7 17:40:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* mkconfig.rb, lib/rbconfig/obsolete.rb: warn obsolete and
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index abbd2bf870f..d884d382fff 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 576e4cd23c6..83f68ec083f 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