archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 00:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

merge revision(s) 39772,39773: [Backport #8080]

Browse source 
* 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 <sys/time.h>


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-03-20 13:34:16 +00:00
parent 55f14b4551
commit ccb9fb0b26
9 changed files with 51 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
Wed Mar 20 22:33:26 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* include/ruby/missing.h (struct timespec): include <sys/time.h>
Wed Mar 20 22:33:26 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* 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.
Mon Mar 18 00:12:28 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/commands/setup_command.rb: Don't delete non-rubygems

7
configure.in
View file

@ -1371,6 +1371,13 @@ AC_CHECK_MEMBERS([struct stat.st_ctim])
AC_CHECK_MEMBERS([struct stat.st_ctimespec])
AC_CHECK_MEMBERS([struct stat.st_ctimensec])
AC_CHECK_TYPES([struct timeval], [], [], [@%:@ifdef HAVE_TIME_H
@%:@include <time.h>
@%:@endif
@%:@ifdef HAVE_SYS_TIME_H
@%:@include <sys/time.h>
@%:@endif])
AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
@%:@include <time.h>
@%:@endif

4
ext/date/date_strftime.c
View file

@ -12,6 +12,10 @@
#include <ctype.h>
#include <errno.h>
#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
#endif
#undef strchr /* avoid AIX weirdness */
#define range(low, item, hi) (item)

4
file.c
View file

@ -75,6 +75,10 @@ int flock(int, int);
#include <fcntl.h>
#endif
#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
#endif
#if !defined HAVE_LSTAT && !defined lstat
#define lstat stat
#endif

6
include/ruby/missing.h
View file

@ -25,6 +25,7 @@ extern "C" {
#include RUBY_EXTCONF_H
#endif
#if !defined(HAVE_STRUCT_TIMEVAL)
# if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
# elif !defined(_WIN32)
@ -34,11 +35,16 @@ struct timeval {
long tv_usec; /* microseconds */
};
# 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>
# endif
struct timespec {
time_t tv_sec; /* seconds */
long tv_nsec; /* nanoseconds */

3
random.c
View file

@ -73,6 +73,9 @@ The original copyright notice follows.
#endif
#include <math.h>
#include <errno.h>
#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
#endif
#ifdef _WIN32
# if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0400

3
thread_pthread.c
View file

@ -33,6 +33,9 @@
#if HAVE_POLL
#include <poll.h>
#endif
#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
#endif
static void native_mutex_lock(pthread_mutex_t *lock);
static void native_mutex_unlock(pthread_mutex_t *lock);

4
time.c
View file

@ -27,6 +27,10 @@
#include <strings.h>
#endif
#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
#endif
#include "timev.h"
static ID id_divmod, id_mul, id_submicro, id_nano_num, id_nano_den, id_offset, id_zone;

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-03-20"
#define RUBY_PATCHLEVEL 73
#define RUBY_PATCHLEVEL 74
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 3