kosaki	2012-07-10 00:52:49 +0900 (Tue, 10 Jul 2012)

  New Revision: 36346

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

  Log:
    * dln.c: Simplify and make consistent an ifdef for Mac OS X.
    * ext/socket/rubysocket.h: ditto.
    * ext/tk/stubs.c: ditto.
    * io.c: ditto.
    * process.c: ditto.
    * signal.c: ditto.
    * vm_dump.c: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/dln.c
    trunk/ext/socket/rubysocket.h
    trunk/ext/tk/stubs.c
    trunk/io.c
    trunk/process.c
    trunk/signal.c
    trunk/vm_dump.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36345)
+++ ChangeLog	(revision 36346)
@@ -1,3 +1,13 @@
+Mon Jul  9 23:59:36 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* dln.c: Simplify and make consistent an ifdef for Mac OS X.
+	* ext/socket/rubysocket.h: ditto.
+	* ext/tk/stubs.c: ditto.
+	* io.c: ditto.
+	* process.c: ditto.
+	* signal.c: ditto.
+	* vm_dump.c: ditto.
+
 Mon Jul  9 17:37:35 2012  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c (win95_stat): remove unnecessary macro.
Index: io.c
===================================================================
--- io.c	(revision 36345)
+++ io.c	(revision 36346)
@@ -4010,8 +4010,7 @@
     if (fptr->fd < 0) return Qnil;
 
     fd = fptr->fd;
-#if defined __APPLE__ && defined(__MACH__) && \
-    (!defined(MAC_OS_X_VERSION_MIN_ALLOWED) || MAC_OS_X_VERSION_MIN_ALLOWED <= 1050)
+#if defined __APPLE__ && (!defined(MAC_OS_X_VERSION_MIN_ALLOWED) || MAC_OS_X_VERSION_MIN_ALLOWED <= 1050)
     /* close(2) on a fd which is being read by another thread causes
      * deadlock on Mac OS X 10.5 */
     rb_thread_fd_close(fd);
Index: dln.c
===================================================================
--- dln.c	(revision 36345)
+++ dln.c	(revision 36346)
@@ -75,7 +75,7 @@
 char *getenv();
 #endif
 
-#if defined(__APPLE__) && defined(__MACH__)   /* Mac OS X */
+#ifdef __APPLE__
 # if defined(HAVE_DLOPEN)
    /* Mac OS X with dlopen (10.3 or later) */
 #  define MACOSX_DLOPEN
Index: process.c
===================================================================
--- process.c	(revision 36345)
+++ process.c	(revision 36346)
@@ -104,10 +104,6 @@
 #define WSTOPSIG        WEXITSTATUS
 #endif
 
-#if defined(__APPLE__) && ( defined(__MACH__) || defined(__DARWIN__) ) && !defined(__MacOS_X__)
-#define __MacOS_X__ 1
-#endif
-
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
 #define HAVE_44BSD_SETUID 1
 #define HAVE_44BSD_SETGID 1
@@ -127,7 +123,7 @@
 int setregid(rb_gid_t rgid, rb_gid_t egid);
 #endif
 
-#if defined(HAVE_44BSD_SETUID) || defined(__MacOS_X__)
+#if defined(HAVE_44BSD_SETUID) || defined(__APPLE__)
 #if !defined(USE_SETREUID) && !defined(BROKEN_SETREUID)
 #define OBSOLETE_SETREUID 1
 #endif
@@ -2305,7 +2301,7 @@
     rb_execarg_fixup(execarg_obj);
     fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
 
-#ifdef __MacOS_X__
+#ifdef __APPLE__
     rb_exec_without_timer_thread(eargp, errmsg, sizeof(errmsg));
 #else
     rb_exec_async_signal_safe(eargp, errmsg, sizeof(errmsg));
Index: ext/tk/stubs.c
===================================================================
--- ext/tk/stubs.c	(revision 36345)
+++ ext/tk/stubs.c	(revision 36346)
@@ -96,7 +96,7 @@
 # define TK_INDEX 7
 # define TCL_NAME "libtcl8.9%s"
 # define TK_NAME "libtk8.9%s"
-# if defined(__APPLE__) && defined(__MACH__)   /* Mac OS X */
+# ifdef __APPLE__
 #  undef DLEXT
 #  define DLEXT ".dylib"
 # endif
@@ -329,7 +329,7 @@
         if (!p_Tk_Init)
             return NO_Tk_Init;
 
-#if defined USE_TK_STUBS && defined TK_FRAMEWORK && defined(__APPLE__) && defined(__MACH__)
+#if defined USE_TK_STUBS && defined TK_FRAMEWORK && defined(__APPLE__)
 	/*
 	  FIX ME : dirty hack for Mac OS X frameworks.
 	  With stubs, fails to find Resource/Script directory of Tk.framework.
Index: ext/socket/rubysocket.h
===================================================================
--- ext/socket/rubysocket.h	(revision 36345)
+++ ext/socket/rubysocket.h	(revision 36346)
@@ -139,7 +139,7 @@
 };
 #endif
 
-#if defined __APPLE__ && defined __MACH__
+#ifdef __APPLE__
 /*
  * CMSG_ macros are broken on 64bit darwin, because __DARWIN_ALIGN
  * aligns up to __darwin_size_t which is 64bit, but CMSG_DATA is
Index: vm_dump.c
===================================================================
--- vm_dump.c	(revision 36345)
+++ vm_dump.c	(revision 36346)
@@ -761,7 +761,7 @@
 	    "-------------------------------------------\n");
 
     {
-#if defined __MACH__ && defined __APPLE__
+#if defined __APPLE__
 	fprintf(stderr, "\n");
 	fprintf(stderr, "   See Crash Report log file under "
 		"~/Library/Logs/CrashReporter or\n");
Index: signal.c
===================================================================
--- signal.c	(revision 36345)
+++ signal.c	(revision 36346)
@@ -567,7 +567,7 @@
  * and it's delivered as SIGBUS instaed of SIGSEGV to userland. It's crazy
  * wrong IMHO. but anyway we have to care it. Sigh.
  */
-#if defined __MACH__ && defined __APPLE__ && defined USE_SIGALTSTACK
+#if defined __APPLE__ && defined USE_SIGALTSTACK
     int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
     NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th));
     rb_thread_t *th = GET_THREAD();

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