naruse	2015-02-20 15:07:31 +0900 (Fri, 20 Feb 2015)

  New Revision: 49655

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

  Log:
    merge revision(s) 49171:
    
    dir.c: use macros
    
    * dir.c (replace_real_basename): use macros for getattrlist
      buffer.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/dir.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/dir.c
===================================================================
--- ruby_2_2/dir.c	(revision 49654)
+++ ruby_2_2/dir.c	(revision 49655)
@@ -81,7 +81,6 @@ char *strchr(char*,char); https://github.com/ruby/ruby/blob/trunk/ruby_2_2/dir.c#L81
 # define USE_NAME_ON_FS 1
 # define RUP32(size) ((size)+3/4)
 # define SIZEUP32(type) RUP32(sizeof(type))
-# define NEXT(var) var = (void *)((ptr += SIZEUP32(var)) - SIZEUP32(var))
 #else
 # define USE_NAME_ON_FS 0
 #endif
@@ -91,6 +90,7 @@ char *strchr(char*,char); https://github.com/ruby/ruby/blob/trunk/ruby_2_2/dir.c#L90
 #else
 # define NORMALIZE_UTF8PATH 0
 #endif
+
 #if NORMALIZE_UTF8PATH
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -1375,7 +1375,7 @@ is_case_sensitive(DIR *dirp) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/dir.c#L1375
 static char *
 replace_real_basename(char *path, long base, int norm_p)
 {
-    u_int32_t attrbuf[(sizeof(attrreference_t) + MAXPATHLEN * 3 + sizeof(u_int32_t) - 1) / sizeof(u_int32_t) + 1];
+    u_int32_t attrbuf[SIZEUP32(attrreference_t) + RUP32(MAXPATHLEN * 3) + 1];
     struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_NAME};
     const attrreference_t *ar = (void *)(attrbuf+1);
     const char *name;
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49654)
+++ ruby_2_2/version.h	(revision 49655)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-20"
-#define RUBY_PATCHLEVEL 63
+#define RUBY_PATCHLEVEL 64
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2

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


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