diff options
| author | 卜部昌平 <shyouhei@ruby-lang.org> | 2020-04-08 13:28:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 13:28:13 +0900 |
| commit | 9e6e39c3512f7a962c44dc3729c98a0f8be90341 (patch) | |
| tree | 901a22676d54d78240e450b64a8cd06eb1703910 /ext/socket/rubysocket.h | |
| parent | 5ac4bf2cd87e1eb5779ca5ae7f96a1a22e8436d9 (diff) | |
| download | ruby-9e6e39c3512f7a962c44dc3729c98a0f8be90341.tar.gz | |
Merge pull request #2991 from shyouhei/ruby.h
Split ruby.h
Diffstat (limited to 'ext/socket/rubysocket.h')
| -rw-r--r-- | ext/socket/rubysocket.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index 5dca68a198..867e215273 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -4,6 +4,16 @@ #include "ruby/config.h" #include RUBY_EXTCONF_H +#ifdef __sun +/* (Recent?) Solaris' <nfs/nfs.h> have conflicting definition of T_DATA. Let + * us honour system definition by undefining ours. + * + * See also [ruby-core:4261] + */ +# include "ruby/ruby.h" +# undef T_DATA +#endif + #include <errno.h> #include <stdio.h> |