From 604990a53b246ed64ec930a145e6337706bbbb1f Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 30 Jun 2008 16:15:53 +0000 Subject: [PATCH] Bug 985 - MSC math.h / M_PI issue * clutter/cogl/gl/cogl.c (set_clip_plane): * clutter/clutter-alpha.c (sinc_func): Use G_PI instead of M_PI because M_PI isn't defined in MSVC without a special #define. Thanks to Haakon Sporsheim --- ChangeLog | 9 +++++++++ clutter/clutter-alpha.c | 4 ++-- clutter/cogl/gl/cogl.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 667534872..1070fab15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-06-30 Neil Roberts + + Bug 985 - MSC math.h / M_PI issue + + * clutter/cogl/gl/cogl.c (set_clip_plane): + * clutter/clutter-alpha.c (sinc_func): Use G_PI instead of M_PI + because M_PI isn't defined in MSVC without a special + #define. Thanks to Haakon Sporsheim + 2008-06-30 Neil Roberts * clutter/win32/clutter-backend-win32.c (check_vblank_env): Use diff --git a/clutter/clutter-alpha.c b/clutter/clutter-alpha.c index 685d3fb51..b1a4061cc 100644 --- a/clutter/clutter-alpha.c +++ b/clutter/clutter-alpha.c @@ -633,8 +633,8 @@ sinc_func (ClutterAlpha *alpha, /* FIXME: fixed point, and fixed point sine() */ - x = (gdouble) (current_frame_num * angle * M_PI) / n_frames ; - sine = (sin (x - (M_PI / angle)) + offset) * 0.5f; + x = (gdouble) (current_frame_num * angle * G_PI) / n_frames ; + sine = (sin (x - (G_PI / angle)) + offset) * 0.5f; CLUTTER_NOTE (ALPHA, "sine: %2f\n",sine); diff --git a/clutter/cogl/gl/cogl.c b/clutter/cogl/gl/cogl.c index f594c8546..f79d231ca 100644 --- a/clutter/cogl/gl/cogl.c +++ b/clutter/cogl/gl/cogl.c @@ -420,7 +420,7 @@ set_clip_plane (GLint plane_num, /* Calculate the angle between the axes and the line crossing the two points */ angle = atan2f ((vertex_b[1] - vertex_a[1]), - (vertex_b[0] - vertex_a[0])) * 180.0f / M_PI; + (vertex_b[0] - vertex_a[0])) * 180.0f / G_PI; GE( glPushMatrix () ); /* Load the identity matrix and multiply by the reverse of the