merge revision(s) 39987,39993,39998: [Backport #8174]

	* include/ruby/io.h: rename SVR3,4 member names as POSIX compliants,
	  to get rid of conflict on AIX.  [ruby-core:53765] [Bug #8174]

	* include/ruby/io.h: undef POSIX compliants names on AIX, which are no
	  longer needed.  patch suggested by edelsohn (David Edelsohn) in
	  [ruby-core:53815].  [Bug #8174]

	* include/ruby/io.h: undef POSIX compliant names on AIX, which are no

	* include/ruby/io.h: rename SVR3,4 member names as POSIX compliant,


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 40003: [Backport #7996]

	* win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII.
	  fix [ruby-core:53079] [Bug #7996]
	  reported and patched by mmeltner (Michael Meltner).
	  reported by mitchellh (Mitchell Hashimoto).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e