merges r25408 from trunk into ruby_1_9_1.

--
* include/ruby/win32.h (finite, scalb): inline'ed non-standard
  identifier macros.  [ruby-core:2234]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-01-30 12:51:24 +00:00
parent 4edd2a5269
commit 687fd3a1e3
3 changed files with 19 additions and 10 deletions

View file

@ -1,3 +1,8 @@
Tue Oct 20 16:41:18 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/win32.h (finite, scalb): inline'ed non-standard
identifier macros. [ruby-core:2234]
Tue Oct 20 15:38:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (ripper_intern): enable literal optimization.

View file

@ -161,14 +161,14 @@ extern DWORD rb_w32_osid(void);
#define fdopen(h, m) rb_w32_fdopen(h, m)
#undef fsopen
#define fsopen(p, m, sh) rb_w32_fsopen(p, m, sh)
#endif
#endif /* __BORLANDC__ */
#undef execv
#define execv(path,argv) rb_w32_aspawn(P_OVERLAY,path,argv)
#if !defined(__BORLANDC__)
#undef isatty
#define isatty(h) rb_w32_isatty(h)
#endif
#endif /* __BORLANDC__ */
#undef mkdir
#define mkdir(p, m) rb_w32_mkdir(p, m)
@ -176,7 +176,7 @@ extern DWORD rb_w32_osid(void);
#define rmdir(p) rb_w32_rmdir(p)
#undef unlink
#define unlink(p) rb_w32_unlink(p)
#endif
#endif /* RUBY_EXPORT */
#if SIZEOF_OFF_T == 8
#define off_t __int64
@ -282,15 +282,19 @@ extern FILE *rb_w32_fsopen(const char *, const char *, int);
#ifndef isnan
#define isnan(x) _isnan(x)
#endif
#ifndef finite
#define finite(x) _finite(x)
#endif
static inline int
finite(double x)
{
return _finite(x);
}
#ifndef copysign
#define copysign(a, b) _copysign(a, b)
#endif
#ifndef scalb
#define scalb(a, b) _scalb(a, b)
#endif
static inline double
scalb(double a, long b)
{
return _scalb(a, b);
}
#endif
#if !defined S_IFIFO && defined _S_IFIFO

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 402
#define RUBY_PATCHLEVEL 403
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1