usa	2016-08-16 20:57:26 +0900 (Tue, 16 Aug 2016)

  New Revision: 55938

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55938

  Log:
    merge revision(s) 55233: [Backport #12446]
    
    * missing/crypt.c: fix size macros to use configured values
      for platforms long is larger than 32bit.
      [ruby-core:75792] [Bug #12446]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/missing/crypt.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55937)
+++ ruby_2_2/version.h	(revision 55938)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-08-16"
-#define RUBY_PATCHLEVEL 364
+#define RUBY_PATCHLEVEL 365
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_2/missing/crypt.c
===================================================================
--- ruby_2_2/missing/crypt.c	(revision 55937)
+++ ruby_2_2/missing/crypt.c	(revision 55938)
@@ -84,7 +84,7 @@ static char sccsid[] = "@(#)crypt.c	8.1 https://github.com/ruby/ruby/blob/trunk/ruby_2_2/missing/crypt.c#L84
  * define "LONG_IS_32_BITS" only if sizeof(long)==4.
  * This avoids use of bit fields (your compiler may be sloppy with them).
  */
-#if !defined(cray)
+#if SIZEOF_LONG == 4
 #define	LONG_IS_32_BITS
 #endif
 
@@ -92,10 +92,9 @@ static char sccsid[] = "@(#)crypt.c	8.1 https://github.com/ruby/ruby/blob/trunk/ruby_2_2/missing/crypt.c#L92
  * define "B64" to be the declaration for a 64 bit integer.
  * XXX this feature is currently unused, see "endian" comment below.
  */
-#if defined(cray)
+#if SIZEOF_LONG == 8
 #define	B64	long
-#endif
-#if defined(convex)
+#elif SIZEOF_LONG_LONG == 8
 #define	B64	long long
 #endif
 
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 55937)
+++ ruby_2_2/ChangeLog	(revision 55938)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Aug 16 20:56:30 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* missing/crypt.c: fix size macros to use configured values
+	  for platforms long is larger than 32bit.
+	  [ruby-core:75792] [Bug #12446]
+
 Tue Aug 16 20:40:36 2016  Kazuki Yamaguchi  <k@r...>
 
 	* ext/openssl/ossl_bn.c (try_convert_to_bnptr): Extracted from

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55233


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