From 7631f28cc9c4804ee05ed7353991841e4527b750 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 20 Mar 2013 14:10:09 +0000 Subject: 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 --- include/ruby/missing.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/ruby') 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 #endif #if defined(HAVE_SYS_TIME_H) # include #endif +#endif #if !defined(HAVE_STRUCT_TIMEVAL) struct timeval { -- cgit v1.2.3