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].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 20 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 34197047d6..77f0554cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Mar 20 22:34:52 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* 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@gmail.com>
 
 	* include/ruby/missing.h (struct timespec): include <sys/time.h>
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 5ff17a4971..a66848b5b8 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -31,6 +31,11 @@ extern "C" {
 #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
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 616e699ad5..7ae2530239 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -37,10 +37,6 @@ struct timeval {
 # 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 {
 };
 #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
diff --git a/io.c b/io.c
index b07e94b10b..ada5d9b523 100644
--- a/io.c
+++ b/io.c
@@ -109,6 +109,11 @@
 # 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
diff --git a/version.h b/version.h
index 65c4347e25..e21c52a9e4 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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