kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r31278 from trunk into ruby_1_9_2.

Browse source 
--
* include/ruby/win32.h (frexp, modf): wrongly declared as pure in
  mingw math.h.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-29 22:50:03 +00:00
parent 49ed59fdec
commit f13e0ec80e
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Apr 14 21:21:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/win32.h (frexp, modf): wrongly declared as pure in
mingw math.h.
Thu Apr 14 21:21:01 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Apr 14 21:21:01 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/win32.h (ftruncate, truncate): mingw64 misses * include/ruby/win32.h (ftruncate, truncate): mingw64 misses

14
include/ruby/win32.h
View file

@ -674,6 +674,20 @@ in asynchronous_func_t.
typedef uintptr_t (*asynchronous_func_t)(uintptr_t self, int argc, uintptr_t* argv); typedef uintptr_t (*asynchronous_func_t)(uintptr_t self, int argc, uintptr_t* argv);
uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc, uintptr_t* argv, uintptr_t intrval); uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc, uintptr_t* argv, uintptr_t intrval);
#ifdef __MINGW_ATTRIB_PURE
/* get rid of bugs in math.h of mingw */
#define frexp(_X, _Y) __extension__ ({\
int *intptr_frexp_bug = (_Y);\
*intptr_frexp_bug = *intptr_frexp_bug;\
frexp((_X), intptr_frexp_bug);\
})
#define modf(_X, _Y) __extension__ ({\
double *intptr_modf_bug = (_Y);\
*intptr_modf_bug = *intptr_modf_bug;\
modf((_X), intptr_modf_bug);\
})
#endif
#if defined(__cplusplus) #if defined(__cplusplus)
#if 0 #if 0
{ /* satisfy cc-mode */ { /* satisfy cc-mode */

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 229 #define RUBY_PATCHLEVEL 230
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1