diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-07 08:49:18 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-07 08:49:18 +0000 |
| commit | f6404fa6d58927e28fb24f3f66b5e3b3c5c1b0c9 (patch) | |
| tree | be98c0c3551027f8d4678c19e3e02e4831b272d1 /include | |
| parent | df96e4184556346d821541d847f9fca7b53e29a5 (diff) | |
| download | ruby-f6404fa6d58927e28fb24f3f66b5e3b3c5c1b0c9.tar.gz | |
* 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
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/missing.h | 8 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 11 |
2 files changed, 8 insertions, 11 deletions
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 |