ruby-changes:63495
From: Rei <ko1@a...>
Date: Sun, 1 Nov 2020 14:14:36 +0900 (JST)
Subject: [ruby-changes:63495] 305c79af2f (master): ext/socket/rubysocket.h: avoid the conflict of T_DATA definition in AIX
https://git.ruby-lang.org/ruby.git/commit/?id=305c79af2f From 305c79af2f3358f3c330b00c6a883634894bc35c Mon Sep 17 00:00:00 2001 From: Rei Odaira <rodaira@u...> Date: Sun, 1 Nov 2020 00:12:01 -0500 Subject: ext/socket/rubysocket.h: avoid the conflict of T_DATA definition in AIX diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index 91b446d..9724fcc 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -4,7 +4,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/socket/rubysocket.h#L4 #include "ruby/config.h" #include RUBY_EXTCONF_H -#ifdef __sun +#if defined(__sun) || defined(_AIX) /* (Recent?) Solaris' <nfs/nfs.h> have conflicting definition of T_DATA. Let * us honour system definition by undefining ours. * -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/