aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-11 12:30:24 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-11 12:30:24 +0000
commit3c9e6f1e624031b4736941804ad1f25f685b3999 (patch)
treeac88be370e39f9bd5508d45cc77841e9f445fcfd
parent4997572f7ee26f09a6983b35593766f5bcbbd4a8 (diff)
downloadruby-3c9e6f1e624031b4736941804ad1f25f685b3999.tar.gz
win32.c: fix infinite recursion
* win32/win32.c (rb_w32_pow): undef pow to get rid of infinite recursive call. re-fix [Bug #8495]. [ruby-core:55923] [Bug #8621] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a130196c97..f6346e8f97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 11 21:30:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_pow): undef pow to get rid of infinite
+ recursive call. re-fix [Bug #8495]. [ruby-core:55923] [Bug #8621]
+
Thu Jul 11 20:18:13 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/win32/lib/win32/registry.rb (Win32::Registry::API#make_wstr):
diff --git a/win32/win32.c b/win32/win32.c
index 34bd15eb26..291dc2aebe 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -6969,6 +6969,7 @@ rb_w32_unwrap_io_handle(int fd)
double
rb_w32_pow(double x, double y)
{
+#undef pow
double r;
unsigned int default_control = _controlfp(0, 0);
_controlfp(_PC_64, _MCW_PC);