usa	2013-02-06 14:13:40 +0900 (Wed, 06 Feb 2013)

  New Revision: 39091

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

  Log:
    merge revision(s) 36151: [Backport #7746]
    
    * missing/setproctitle.c (environ): use (*_NSGetEnviron()) instead of
      environ on Darwin for namespace cleanness, same as [ruby-core:00537].
      [ruby-core:45615] [Bug #6576]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/missing/setproctitle.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 39090)
+++ ruby_1_9_3/ChangeLog	(revision 39091)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Wed Feb  6 14:13:25 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* missing/setproctitle.c (environ): use (*_NSGetEnviron()) instead of
+	  environ on Darwin for namespace cleanness, same as [ruby-core:00537].
+	  [ruby-core:45615] [Bug #6576]
+
 Wed Feb  6 14:05:09 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* dir.c (glob_make_pattern): names under recursive need to be single
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 39090)
+++ ruby_1_9_3/version.h	(revision 39091)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 376
+#define RUBY_PATCHLEVEL 377
 
 #define RUBY_RELEASE_DATE "2013-02-06"
 #define RUBY_RELEASE_YEAR 2013
Index: ruby_1_9_3/missing/setproctitle.c
===================================================================
--- ruby_1_9_3/missing/setproctitle.c	(revision 39090)
+++ ruby_1_9_3/missing/setproctitle.c	(revision 39091)
@@ -48,6 +48,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/missing/setproctitle.c#L48
 #endif
 #include <string.h>
 
+#if defined(__APPLE__)
+#include <crt_externs.h>
+#undef environ
+#define environ (*_NSGetEnviron())
+#endif
+
 #define SPT_NONE	0	/* don't use it at all */
 #define SPT_PSTAT	1	/* use pstat(PSTAT_SETCMD, ...) */
 #define SPT_REUSEARGV	2	/* cover argv with title information */

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36151


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