From b97e925571e32dff40573af7991d7dfe7fc9c7ce Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 28 Mar 2013 10:10:00 +0000 Subject: merge revision(s) 39772,39773,39774,39775,39777,39779,39781,39783: [Backport #8080] * configure.in: check struct timeval exist or not. * include/ruby/missing.h (struct timeval): check HAVE_STRUCT_TIMEVAL properly. and don't include sys/time.h if struct timeval exist. * file.c: include sys/time.h explicitly. * random.c: ditto. * thread_pthread.c: ditto. * time.c: ditto. * ext/date/date_strftime.c: ditto. * include/ruby/missing.h (struct timespec): include * include/ruby/missing.h (__syscall): moved to... * io.c: here. because __syscall() is only used from io.c. * include/ruby/missing.h: move "#include " to .... * include/ruby/intern.h: here. because it was introduced for fixing NFDBITS issue. [ruby-core:05179]. * thread.c: disabled _FORTIFY_SOURCE for avoid to hit glibc bug. [Bug #8080] [ruby-core:53349] * test/ruby/test_io.rb (TestIO#test_io_select_with_many_files): test for the above. * include/ruby/missing.h: removed __linux__. it's unnecessary. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- file.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'file.c') diff --git a/file.c b/file.c index fd64116d24..c60de23302 100644 --- a/file.c +++ b/file.c @@ -68,6 +68,10 @@ int flock(int, int); #include #endif +#if defined(HAVE_SYS_TIME_H) +#include +#endif + #if !defined HAVE_LSTAT && !defined lstat #define lstat stat #endif -- cgit v1.2.3