diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-16 05:07:14 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-16 05:07:14 +0000 |
commit | c824d47ebc829560d022df74d355f69c601ea102 (patch) | |
tree | 2fbac0e827e13a2a69fe113a69b891a60c19c9ba | |
parent | 03a6ce80d04dd386a8514faf4abc86b3ea290a68 (diff) | |
download | ruby-c824d47ebc829560d022df74d355f69c601ea102.tar.gz |
* 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/trunk@39774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | include/ruby/intern.h | 5 | ||||
-rw-r--r-- | include/ruby/missing.h | 9 | ||||
-rw-r--r-- | io.c | 5 |
4 files changed, 19 insertions, 9 deletions
@@ -1,3 +1,12 @@ +Wed Mar 13 15:16:35 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 13 14:38:53 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 56e2452974..ae265ec3c0 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 @@ -110,6 +110,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 |