diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/ruby/missing.h | 8 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 11 |
3 files changed, 13 insertions, 11 deletions
@@ -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 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 |