akr	2011-10-24 23:57:08 +0900 (Mon, 24 Oct 2011)

  New Revision: 33521

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33521

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/atomic.h
    trunk/complex.c
    trunk/ext/io/wait/wait.c
    trunk/hash.c
    trunk/math.c

Index: complex.c
===================================================================
--- complex.c	(revision 33520)
+++ complex.c	(revision 33521)
@@ -1173,7 +1173,7 @@
 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
Index: math.c
===================================================================
--- math.c	(revision 33520)
+++ math.c	(revision 33521)
@@ -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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33520)
+++ ChangeLog	(revision 33521)
@@ -1,3 +1,17 @@
+Mon Oct 24 23:55:31 2011  Tanaka Akira  <akr@f...>
+
+	* 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@f...>
 
 	* io.c: use "__sun" instead of "sun" to detect SunOS.
Index: ext/io/wait/wait.c
===================================================================
--- ext/io/wait/wait.c	(revision 33520)
+++ ext/io/wait/wait.c	(revision 33521)
@@ -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)
Index: hash.c
===================================================================
--- hash.c	(revision 33520)
+++ hash.c	(revision 33521)
@@ -2196,7 +2196,7 @@
 }
 
 #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 @@
 	    rb_sys_fail("unsetenv");
 #endif
     }
-#elif defined __sun__
+#elif defined __sun
     size_t len;
     char **env_ptr, *str;
     if (strchr(name, '=')) {
Index: atomic.h
===================================================================
--- atomic.h	(revision 33520)
+++ atomic.h	(revision 33521)
@@ -42,7 +42,7 @@
 # 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;
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/