diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-20 14:10:09 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-20 14:10:09 +0000 |
| commit | 7631f28cc9c4804ee05ed7353991841e4527b750 (patch) | |
| tree | b7cee8211190ca2c503ac4ec30a4ec5e8753254c /include | |
| parent | 4346f5d6999dd56ef25ff7f062ee738aaa034014 (diff) | |
merge revision(s) 39781,39783: [Backport #8080]
missing.h: build fix
* include/ruby/missing.h: include time.h and sys/time.h iff needed,
but excepct for sys/time.h on linux to get rid of glibc bug.
* include/ruby/missing.h: removed __linux__. it's unnecessary.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/missing.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ruby/missing.h b/include/ruby/missing.h index fc333e1a47..9b502cd3d8 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -25,12 +25,14 @@ extern "C" { #include RUBY_EXTCONF_H #endif +#if !defined(HAVE_STRUCT_TIMEVAL) || !defined(HAVE_STRUCT_TIMESPEC) #if defined(HAVE_TIME_H) # include <time.h> #endif #if defined(HAVE_SYS_TIME_H) # include <sys/time.h> #endif +#endif #if !defined(HAVE_STRUCT_TIMEVAL) struct timeval { |