summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-24 13:49:58 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-24 13:49:58 +0000
commitb317a4cd28f575b60cdff0da86afef5c1bde9a06 (patch)
treee69c586e43d18c97048102b6e9fb963da005c690 /io.c
parent5153fd2a5e930b70ebae087e2f6e254cf4a30929 (diff)
* io.c: use "__sun" instead of "sun" to detect SunOS.
* dln.c: ditto. * cont.c: ditto. * ext/sdbm/_sdbm.c: ditto. [ruby-dev:44693] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/io.c b/io.c
index 15e2ec982b..35157ec6ff 100644
--- a/io.c
+++ b/io.c
@@ -35,7 +35,7 @@
# define NO_SAFE_RENAME
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(sun) || defined(_nec_ews)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__sun) || defined(_nec_ews)
# define USE_SETVBUF
#endif
@@ -4649,18 +4649,18 @@ rb_fdopen(int fd, const char *modestr)
{
FILE *file;
-#if defined(sun)
+#if defined(__sun)
errno = 0;
#endif
file = fdopen(fd, modestr);
if (!file) {
if (
-#if defined(sun)
+#if defined(__sun)
errno == 0 ||
#endif
errno == EMFILE || errno == ENFILE) {
rb_gc();
-#if defined(sun)
+#if defined(__sun)
errno = 0;
#endif
file = fdopen(fd, modestr);
@@ -4668,7 +4668,7 @@ rb_fdopen(int fd, const char *modestr)
if (!file) {
#ifdef _WIN32
if (errno == 0) errno = EINVAL;
-#elif defined(sun)
+#elif defined(__sun)
if (errno == 0) errno = EMFILE;
#endif
rb_sys_fail(0);