diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-20 13:36:23 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-20 13:36:23 +0000 |
| commit | 552817e561e55ea19bd27194fc0e5dff2a7981e9 (patch) | |
| tree | a47b86b8f34c3b938bd8728b8cb93d2f5efceb28 /include | |
| parent | ccb9fb0b26fa8fed9320a0b2e0ca86202dd4b3de (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/intern.h | 5 | ||||
| -rw-r--r-- | include/ruby/missing.h | 9 |
2 files changed, 5 insertions, 9 deletions
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 |