diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-24 14:57:08 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-24 14:57:08 +0000 |
commit | 2bb5441808b95926697799de2ab2d2675c89084e (patch) | |
tree | 12d7ebb79bcacca1b0dcf7d812209721aa6a7e58 | |
parent | b317a4cd28f575b60cdff0da86afef5c1bde9a06 (diff) |
* complex.c: use "__sun" instead of "__sun__" to detect SunOS.
* math.c: ditto.
* hash.c: ditto.
* atomic.h: ditto.
* ext/io/wait/wait.c: ditto.
[ruby-dev:44693]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | atomic.h | 2 | ||||
-rw-r--r-- | complex.c | 2 | ||||
-rw-r--r-- | ext/io/wait/wait.c | 2 | ||||
-rw-r--r-- | hash.c | 4 | ||||
-rw-r--r-- | math.c | 2 |
6 files changed, 20 insertions, 6 deletions
@@ -1,3 +1,17 @@ +Mon Oct 24 23:55:31 2011 Tanaka Akira <[email protected]> + + * complex.c: use "__sun" instead of "__sun__" to detect SunOS. + + * math.c: ditto. + + * hash.c: ditto. + + * atomic.h: ditto. + + * ext/io/wait/wait.c: ditto. + + [ruby-dev:44693] + Mon Oct 24 22:45:37 2011 Tanaka Akira <[email protected]> * io.c: use "__sun" instead of "sun" to detect SunOS. @@ -42,7 +42,7 @@ typedef unsigned int rb_atomic_t; /* Anything OK */ # define ATOMIC_OR(var, val) __sync_or_and_fetch(&(var), (val)) # define ATOMIC_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val)) -#elif defined(__sun) || defined(__sun__) +#elif defined(__sun) #include <atomic.h> typedef unsigned int rb_atomic_t; @@ -1173,7 +1173,7 @@ nucomp_eql_p(VALUE self, VALUE other) inline static VALUE f_signbit(VALUE x) { -#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun__) && \ +#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \ !defined(signbit) extern int signbit(double); #endif diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c index eb7ed03cea..197d9b6173 100644 --- a/ext/io/wait/wait.c +++ b/ext/io/wait/wait.c @@ -14,7 +14,7 @@ #include "ruby/io.h" #include <sys/types.h> -#if defined(HAVE_UNISTD_H) && (defined(__sun) || defined(__sun__)) +#if defined(HAVE_UNISTD_H) && (defined(__sun)) #include <unistd.h> #endif #if defined(HAVE_SYS_IOCTL_H) @@ -2196,7 +2196,7 @@ rb_env_path_tainted(void) } #if defined(_WIN32) || (defined(HAVE_SETENV) && defined(HAVE_UNSETENV)) -#elif defined __sun__ +#elif defined __sun static int in_origenv(const char *str) { @@ -2284,7 +2284,7 @@ ruby_setenv(const char *name, const char *value) rb_sys_fail("unsetenv"); #endif } -#elif defined __sun__ +#elif defined __sun size_t len; char **env_ptr, *str; if (strchr(name, '=')) { @@ -14,7 +14,7 @@ #include <math.h> #include <errno.h> -#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun__) && \ +#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \ !defined(signbit) extern int signbit(double); #endif |