nagachika	2013-03-20 22:36:23 +0900 (Wed, 20 Mar 2013)

  New Revision: 39839

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

  Log:
    merge revision(s) 39774: [Backport #8080]
    
    * include/ruby/missing.h (__syscall): moved to...
    
    * io.c: here. because __syscall() is only used from io.c.
    
    * include/ruby/missing.h: move "#include <sys/type.h>" to ....
    
    * include/ruby/intern.h: here. because it was introduced for
      fixing NFDBITS issue. [ruby-core:05179].

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/include/ruby/intern.h
    branches/ruby_2_0_0/include/ruby/missing.h
    branches/ruby_2_0_0/io.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/include/ruby/intern.h
===================================================================
--- ruby_2_0_0/include/ruby/intern.h	(revision 39838)
+++ ruby_2_0_0/include/ruby/intern.h	(revision 39839)
@@ -31,6 +31,11 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/include/ruby/intern.h#L31
 #else
 # include <varargs.h>
 #endif
+
+#if defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
+#endif
+
 #include "ruby/st.h"
 
 #if defined __GNUC__ && __GNUC__ >= 4
Index: ruby_2_0_0/include/ruby/missing.h
===================================================================
--- ruby_2_0_0/include/ruby/missing.h	(revision 39838)
+++ ruby_2_0_0/include/ruby/missing.h	(revision 39839)
@@ -37,10 +37,6 @@ struct timeval { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/include/ruby/missing.h#L37
 # endif
 #endif /* HAVE_STRUCT_TIMEVAL */
 
-#if defined(HAVE_SYS_TYPES_H)
-#  include <sys/types.h>
-#endif
-
 #if !defined(HAVE_STRUCT_TIMESPEC)
 # if defined(HAVE_SYS_TIME_H)
 #  include <sys/time.h>
@@ -58,11 +54,6 @@ struct timezone { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/include/ruby/missing.h#L54
 };
 #endif
 
-#if defined(HAVE___SYSCALL) && (defined(__APPLE__) || defined(__OpenBSD__))
-/* Mac OS X and OpenBSD have __syscall but don't define it in headers */
-off_t __syscall(quad_t number, ...);
-#endif
-
 #ifdef RUBY_EXPORT
 #undef RUBY_EXTERN
 #endif
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39838)
+++ ruby_2_0_0/ChangeLog	(revision 39839)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Mar 20 22:34:52 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* include/ruby/missing.h (__syscall): moved to...
+	* io.c: here. because __syscall() is only used from io.c.
+
+	* include/ruby/missing.h: move "#include <sys/type.h>" to ....
+	* include/ruby/intern.h: here. because it was introduced for
+	  fixing NFDBITS issue. [ruby-core:05179].
+
 Wed Mar 20 22:33:26 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* include/ruby/missing.h (struct timespec): include <sys/time.h>
Index: ruby_2_0_0/io.c
===================================================================
--- ruby_2_0_0/io.c	(revision 39838)
+++ ruby_2_0_0/io.c	(revision 39839)
@@ -109,6 +109,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/io.c#L109
 # endif
 #endif
 
+#if defined(HAVE___SYSCALL) && (defined(__APPLE__) || defined(__OpenBSD__))
+/* Mac OS X and OpenBSD have __syscall but don't define it in headers */
+off_t __syscall(quad_t number, ...);
+#endif
+
 #define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
 
 #define IO_RBUF_CAPA_MIN  8192
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39838)
+++ ruby_2_0_0/version.h	(revision 39839)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-20"
-#define RUBY_PATCHLEVEL 74
+#define RUBY_PATCHLEVEL 75
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39774


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