1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
akr 2011-10-24 14:57:08 +00:00
parent b317a4cd28
commit 2bb5441808
6 changed files with 20 additions and 6 deletions

View file

@ -1,3 +1,17 @@
Mon Oct 24 23:55:31 2011 Tanaka Akira <akr@fsij.org>
* 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 <akr@fsij.org> Mon Oct 24 22:45:37 2011 Tanaka Akira <akr@fsij.org>
* io.c: use "__sun" instead of "sun" to detect SunOS. * io.c: use "__sun" instead of "sun" to detect SunOS.

View file

@ -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_OR(var, val) __sync_or_and_fetch(&(var), (val))
# define ATOMIC_EXCHANGE(var, val) __sync_lock_test_and_set(&(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> #include <atomic.h>
typedef unsigned int rb_atomic_t; typedef unsigned int rb_atomic_t;

View file

@ -1173,7 +1173,7 @@ nucomp_eql_p(VALUE self, VALUE other)
inline static VALUE inline static VALUE
f_signbit(VALUE x) f_signbit(VALUE x)
{ {
#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun__) && \ #if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \
!defined(signbit) !defined(signbit)
extern int signbit(double); extern int signbit(double);
#endif #endif

View file

@ -14,7 +14,7 @@
#include "ruby/io.h" #include "ruby/io.h"
#include <sys/types.h> #include <sys/types.h>
#if defined(HAVE_UNISTD_H) && (defined(__sun) || defined(__sun__)) #if defined(HAVE_UNISTD_H) && (defined(__sun))
#include <unistd.h> #include <unistd.h>
#endif #endif
#if defined(HAVE_SYS_IOCTL_H) #if defined(HAVE_SYS_IOCTL_H)

4
hash.c
View file

@ -2196,7 +2196,7 @@ rb_env_path_tainted(void)
} }
#if defined(_WIN32) || (defined(HAVE_SETENV) && defined(HAVE_UNSETENV)) #if defined(_WIN32) || (defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
#elif defined __sun__ #elif defined __sun
static int static int
in_origenv(const char *str) in_origenv(const char *str)
{ {
@ -2284,7 +2284,7 @@ ruby_setenv(const char *name, const char *value)
rb_sys_fail("unsetenv"); rb_sys_fail("unsetenv");
#endif #endif
} }
#elif defined __sun__ #elif defined __sun
size_t len; size_t len;
char **env_ptr, *str; char **env_ptr, *str;
if (strchr(name, '=')) { if (strchr(name, '=')) {

2
math.c
View file

@ -14,7 +14,7 @@
#include <math.h> #include <math.h>
#include <errno.h> #include <errno.h>
#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun__) && \ #if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \
!defined(signbit) !defined(signbit)
extern int signbit(double); extern int signbit(double);
#endif #endif