From 42e36319bdee85d67e03fff042663b6209b61d62 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 21 Jul 2015 10:51:40 +0000 Subject: ruby/missing.h: M_PI fallback definition * include/ruby/missing.h (M_PI, M_PI_2): fallback definitions for VC6. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- complex.c | 2 +- include/ruby/missing.h | 7 +++++++ math.c | 3 --- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/complex.c b/complex.c index 50d53afcde..beaf6713a1 100644 --- a/complex.c +++ b/complex.c @@ -5,12 +5,12 @@ which is written in ruby. */ -#include "internal.h" #if defined _MSC_VER /* Microsoft Visual C does not define M_PI and others by default */ # define _USE_MATH_DEFINES 1 #endif #include +#include "internal.h" #define NDEBUG #include diff --git a/include/ruby/missing.h b/include/ruby/missing.h index 161d95430a..f9e9daed3a 100644 --- a/include/ruby/missing.h +++ b/include/ruby/missing.h @@ -37,6 +37,13 @@ extern "C" { #endif #endif +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif +#ifndef M_PI_2 +# define M_PI_2 (M_PI/2) +#endif + #ifndef RUBY_SYMBOL_EXPORT_BEGIN # define RUBY_SYMBOL_EXPORT_BEGIN /* begin */ # define RUBY_SYMBOL_EXPORT_END /* end */ diff --git a/math.c b/math.c index 22bd731745..134d937358 100644 --- a/math.c +++ b/math.c @@ -106,9 +106,6 @@ num2dbl_with_to_f(VALUE num) static VALUE math_atan2(VALUE obj, VALUE y, VALUE x) { -#ifndef M_PI -# define M_PI 3.14159265358979323846 -#endif double dx, dy; dx = Get_Double(x); dy = Get_Double(y); -- cgit v1.2.3