Attachment 30659 Details for Bug 24318 – Remove the various definitions of M_PI, except in compiler.h

[patch] Remove the various definitions of M_PI, except in compiler.h

0001-Remove-definitions-of-M_PI.patch (text/plain), 22.43 KB, created by Jon Turney on 2009-10-24 10:17:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2009-10-24 10:17:59 UTC

Size: 22.43 KB

patch

obsolete

>From af80907b518534a98a0024bf69a45234b2e25958 Mon Sep 17 00:00:00 2001
>From: Jon TURNEY <jon.turney@dronecode.org.uk>
>Date: Sat, 24 Oct 2009 12:38:01 +0100
>Subject: [PATCH 1/2] Remove definitions of M_PI
>
>Remove the many and various definitions of M_PI, except the one in compiler.h
>
>I have assumed that the precision of the value of M_PI is not significant, which
>should be the case anyhow, as these values are only a fall-back
>
>Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
>---
> progs/demos/dinoshade.c                       |    5 -----
> progs/demos/engine.c                          |    4 ----
> progs/demos/fbo_firecube.c                    |    4 ----
> progs/demos/fire.c                            |    4 ----
> progs/demos/gearbox.c                         |    4 ----
> progs/demos/gears.c                           |    4 ----
> progs/demos/geartrain.c                       |    3 ---
> progs/demos/ipers.c                           |    4 ----
> progs/demos/pointblast.c                      |    5 -----
> progs/demos/projtex.c                         |    5 -----
> progs/demos/rain.cxx                          |    3 ---
> progs/demos/ray.c                             |    4 ----
> progs/demos/spriteblast.c                     |    5 -----
> progs/demos/stex3d.c                          |    4 ----
> progs/demos/teapot.c                          |    4 ----
> progs/demos/terrain.c                         |    4 ----
> progs/demos/tunnel.c                          |    4 ----
> progs/demos/tunnel2.c                         |    4 ----
> progs/demos/winpos.c                          |    4 ----
> progs/directfb/df_gears.c                     |    4 ----
> progs/egl/eglgears.c                          |    5 -----
> progs/egl/peglgears.c                         |    5 -----
> progs/egl/xeglgears.c                         |    5 -----
> progs/ggi/gears.c                             |    4 ----
> progs/ggi/gears2.c                            |    4 ----
> progs/glsl/skinning.c                         |    4 ----
> progs/glsl/texaaline.c                        |    4 ----
> progs/glsl/twoside.c                          |    4 ----
> progs/objviewer/glm.c                         |    5 -----
> progs/objviewer/glm.h                         |    5 -----
> progs/redbook/torus.c                         |    5 -----
> progs/tests/auxbuffer.c                       |    4 ----
> progs/tests/jkrahntest.c                      |    4 ----
> progs/windml/uglgears.c                       |    4 ----
> progs/xdemos/corender.c                       |    4 ----
> progs/xdemos/glxcontexts.c                    |    5 -----
> progs/xdemos/glxgears.c                       |    5 -----
> progs/xdemos/glxgears_fbconfig.c              |    5 -----
> progs/xdemos/glxgears_pixmap.c                |    5 -----
> progs/xdemos/glxswapcontrol.c                 |    5 -----
> progs/xdemos/multictx.c                       |    5 -----
> src/gallium/drivers/i915/i915_fpc_translate.c |    5 -----
> src/gallium/state_trackers/vega/arc.c         |    4 ----
> src/glu/mesa/glu.c                            |    4 ----
> src/glu/mesa/quadric.c                        |    5 -----
> src/glu/mini/glu.c                            |    4 ----
> src/glu/mini/quadric.c                        |    5 -----
> src/glut/beos/glut_shapes.c                   |    5 -----
> src/glut/directfb/models.c                    |    5 -----
> src/glut/glx/glut_shapes.c                    |    5 -----
> src/glut/mini/models.c                        |    5 -----
> src/glut/os2/glut_shapes.cpp                  |    5 -----
> 52 files changed, 0 insertions(+), 230 deletions(-)
>
>diff --git a/progs/demos/dinoshade.c b/progs/demos/dinoshade.c
>index cbf8751..a477d6f 100644
>--- a/progs/demos/dinoshade.c
>+++ b/progs/demos/dinoshade.c
>@@ -46,11 +46,6 @@
> #include <GL/glew.h>    /* OpenGL Utility Toolkit header */
> #include <GL/glut.h>    /* OpenGL Utility Toolkit header */
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> /* Variable controlling various rendering modes. */
> static int stencilReflection = 1, stencilShadow = 1, offsetShadow = 1;
> static int renderShadow = 1, renderDinosaur = 1, renderReflection = 1;
>diff --git a/progs/demos/engine.c b/progs/demos/engine.c
>index 3cf311e..ee1a130 100644
>--- a/progs/demos/engine.c
>+++ b/progs/demos/engine.c
>@@ -15,10 +15,6 @@
> #include "trackball.h"
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> #define DEG_TO_RAD(DEG)  ((DEG) * M_PI / 180.0)
> 
> #define TEXTURE_FILE "../images/reflect.rgb"
>diff --git a/progs/demos/fbo_firecube.c b/progs/demos/fbo_firecube.c
>index b3f7e00..4f1a9fc 100644
>--- a/progs/demos/fbo_firecube.c
>+++ b/progs/demos/fbo_firecube.c
>@@ -104,10 +104,6 @@ static const char *texNames[] =
> 
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> #define vinit(a,i,j,k) {			\
>       (a)[0]=i;					\
>       (a)[1]=j;					\
>diff --git a/progs/demos/fire.c b/progs/demos/fire.c
>index dd70f61..6453aa9 100644
>--- a/progs/demos/fire.c
>+++ b/progs/demos/fire.c
>@@ -25,10 +25,6 @@
> static int fullscreen = 1;
> #endif
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> #define vinit(a,i,j,k) {\
>   (a)[0]=i;\
>   (a)[1]=j;\
>diff --git a/progs/demos/gearbox.c b/progs/demos/gearbox.c
>index 2dcf32f..33e9ec9 100644
>--- a/progs/demos/gearbox.c
>+++ b/progs/demos/gearbox.c
>@@ -11,10 +11,6 @@
> #include <string.h>
> #include <GL/glut.h>
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
> static GLint WinWidth = 800, WinHeight = 500;
> static GLint TexWidth, TexHeight;
> static GLuint TexObj = 1;
>diff --git a/progs/demos/gears.c b/progs/demos/gears.c
>index 6016162..2971988 100644
>--- a/progs/demos/gears.c
>+++ b/progs/demos/gears.c
>@@ -19,10 +19,6 @@
> #include <string.h>
> #include <GL/glut.h>
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
> static GLint T0 = 0;
> static GLint Frames = 0;
> static GLint autoexit = 0;
>diff --git a/progs/demos/geartrain.c b/progs/demos/geartrain.c
>index 8fe405e..f52b684 100644
>--- a/progs/demos/geartrain.c
>+++ b/progs/demos/geartrain.c
>@@ -35,9 +35,6 @@
> #define min(x, y) ( x < y ? x : y )
> #endif
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif	/*  */
> typedef GLfloat TDA[4];
> 
> TDA background;
>diff --git a/progs/demos/ipers.c b/progs/demos/ipers.c
>index 5d82b0d..b9f9604 100644
>--- a/progs/demos/ipers.c
>+++ b/progs/demos/ipers.c
>@@ -36,10 +36,6 @@ static GLint Frames;
> #define TEX_SKY_WIDTH 256
> #define TEX_SKY_HEIGHT TEX_SKY_WIDTH
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> #define FROM_NONE   0
> #define FROM_DOWN   1
> #define FROM_UP     2
>diff --git a/progs/demos/pointblast.c b/progs/demos/pointblast.c
>index 2d70b72..d4b5645 100644
>--- a/progs/demos/pointblast.c
>+++ b/progs/demos/pointblast.c
>@@ -21,11 +21,6 @@
> #include <GL/glew.h>
> #include <GL/glut.h>
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
> #if 0  /* For debugging. */
> #undef GL_EXT_point_parameters
> #endif
>diff --git a/progs/demos/projtex.c b/progs/demos/projtex.c
>index 99154d7..44eb476 100644
>--- a/progs/demos/projtex.c
>+++ b/progs/demos/projtex.c
>@@ -23,11 +23,6 @@
> #include "readtex.h"
> 
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> #define MAX_TEX 4
> int NumTextures = 1;
> 
>diff --git a/progs/demos/rain.cxx b/progs/demos/rain.cxx
>index 265d90c..431b312 100644
>--- a/progs/demos/rain.cxx
>+++ b/progs/demos/rain.cxx
>@@ -12,9 +12,6 @@
> #include <math.h>
> #include <time.h>
> #include <GL/glut.h>
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
> 
> #include "particles.h"
> extern "C" {
>diff --git a/progs/demos/ray.c b/progs/demos/ray.c
>index c2d8e4f..db8a717 100644
>--- a/progs/demos/ray.c
>+++ b/progs/demos/ray.c
>@@ -41,10 +41,6 @@ static GLint Frames = 0;
> #define TEX_REFLECT_SLOT_SIZE (TEX_REFLECT_HEIGHT/16)
> #define TEX_REFLECT_NUMSLOT (TEX_REFLECT_HEIGHT/TEX_REFLECT_SLOT_SIZE)
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> #define EPSILON 0.0001
> 
> #define clamp255(a)  ( (a)<(0.0f) ? (0.0f) : ((a)>(255.0f) ? (255.0f) : (a)) )
>diff --git a/progs/demos/spriteblast.c b/progs/demos/spriteblast.c
>index d73b680..188d7ef 100644
>--- a/progs/demos/spriteblast.c
>+++ b/progs/demos/spriteblast.c
>@@ -24,11 +24,6 @@
> #include <GL/glew.h>
> #include <GL/glut.h>
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
> #if 0  /* For debugging. */
> #undef GL_EXT_point_parameters
> #endif
>diff --git a/progs/demos/stex3d.c b/progs/demos/stex3d.c
>index c0bbea0..30b74c4 100644
>--- a/progs/demos/stex3d.c
>+++ b/progs/demos/stex3d.c
>@@ -22,10 +22,6 @@
> #include <GL/glut.h>
> 
> 
>-#ifndef M_PI
>-#define M_PI            3.14159265358979323846
>-#endif
>-
> #define NOISE_TEXTURE 1
> #define GRADIENT_TEXTURE 2
> 
>diff --git a/progs/demos/teapot.c b/progs/demos/teapot.c
>index 6bf6e06..fcbbeee 100644
>--- a/progs/demos/teapot.c
>+++ b/progs/demos/teapot.c
>@@ -35,10 +35,6 @@ static GLint Frames = 0;
> #define BASERES 12
> #define TEAPOTRES 3
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> extern void shadowmatrix(GLfloat [4][4], GLfloat [4], GLfloat [4]);
> extern void findplane(GLfloat [4], GLfloat [3], GLfloat [3], GLfloat [3]);
> 
>diff --git a/progs/demos/terrain.c b/progs/demos/terrain.c
>index be78ea4..fbb9ac1 100644
>--- a/progs/demos/terrain.c
>+++ b/progs/demos/terrain.c
>@@ -25,10 +25,6 @@
> static int fullscreen = 1;
> #endif
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
> #define heightMnt	450
> #define	lenghtXmnt	62
> #define lenghtYmnt	62
>diff --git a/progs/demos/tunnel.c b/progs/demos/tunnel.c
>index 6981da3..3d0d2ae 100644
>--- a/progs/demos/tunnel.c
>+++ b/progs/demos/tunnel.c
>@@ -33,10 +33,6 @@ static GLint NiceFog = 1;
> 
> #define NUMBLOC 5
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> /*
> extern int striplength_skin_13[];
> extern float stripdata_skin_13[];
>diff --git a/progs/demos/tunnel2.c b/progs/demos/tunnel2.c
>index 0288ea0..870f2ab 100644
>--- a/progs/demos/tunnel2.c
>+++ b/progs/demos/tunnel2.c
>@@ -45,10 +45,6 @@ static GLint Frames = 0;
> 
> #define NUMBLOC 5
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> static float obs[3] = { 1000.0, 0.0, 2.0 };
> static float dir[3];
> static float v = 30.;
>diff --git a/progs/demos/winpos.c b/progs/demos/winpos.c
>index 13a9c7e..4c89b55 100644
>--- a/progs/demos/winpos.c
>+++ b/progs/demos/winpos.c
>@@ -19,10 +19,6 @@
> #define IMAGE_FILE "../images/girl.rgb"
> 
> 
>-#ifndef M_PI
>-#  define M_PI 3.14159265
>-#endif
>-
> 
> 
> static GLubyte *Image;
>diff --git a/progs/directfb/df_gears.c b/progs/directfb/df_gears.c
>index c480767..fda1623 100644
>--- a/progs/directfb/df_gears.c
>+++ b/progs/directfb/df_gears.c
>@@ -72,10 +72,6 @@ static inline unsigned long get_millis()
> }
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
> /**
> 
>   Draw a gear wheel.  You'll probably want to call this function when
>diff --git a/progs/egl/eglgears.c b/progs/egl/eglgears.c
>index 052d0f9..1c3c95c 100644
>--- a/progs/egl/eglgears.c
>+++ b/progs/egl/eglgears.c
>@@ -83,11 +83,6 @@ current_time(void)
> #endif /*BENCHMARK*/
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
> static GLint gear1, gear2, gear3;
> static GLfloat angle = 0.0;
>diff --git a/progs/egl/peglgears.c b/progs/egl/peglgears.c
>index 212d1ac..553c734 100644
>--- a/progs/egl/peglgears.c
>+++ b/progs/egl/peglgears.c
>@@ -83,11 +83,6 @@ current_time(void)
> #endif /*BENCHMARK*/
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
> static GLint gear1, gear2, gear3;
> static GLfloat angle = 0.0;
>diff --git a/progs/egl/xeglgears.c b/progs/egl/xeglgears.c
>index 614a625..9cda6a7 100644
>--- a/progs/egl/xeglgears.c
>+++ b/progs/egl/xeglgears.c
>@@ -86,11 +86,6 @@ current_time(void)
> 
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
> static GLint gear1, gear2, gear3;
> static GLfloat angle = 0.0;
>diff --git a/progs/ggi/gears.c b/progs/ggi/gears.c
>index 2b3231d..8be0257 100644
>--- a/progs/ggi/gears.c
>+++ b/progs/ggi/gears.c
>@@ -12,10 +12,6 @@
> #include <stdio.h>
> #include <GL/glut.h>
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
> static GLint T0 = 0;
> static GLint Frames = 0;
> 
>diff --git a/progs/ggi/gears2.c b/progs/ggi/gears2.c
>index 9468c03..74eb6f9 100644
>--- a/progs/ggi/gears2.c
>+++ b/progs/ggi/gears2.c
>@@ -12,10 +12,6 @@
> #include <stdlib.h>
> #include <ggi/ggi.h>
> #include <GL/ggimesa.h>
>-#ifndef M_PI
>-#  define M_PI 3.14159265
>-#endif
>-
> 
> ggi_visual_t vis;
> char text[100];
>diff --git a/progs/glsl/skinning.c b/progs/glsl/skinning.c
>index 2b96f31..228b234 100644
>--- a/progs/glsl/skinning.c
>+++ b/progs/glsl/skinning.c
>@@ -16,10 +16,6 @@
> #include <GL/glut.h>
> #include "shaderutil.h"
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> static char *FragProgFile = "skinning.frag";
> static char *VertProgFile = "skinning.vert";
> 
>diff --git a/progs/glsl/texaaline.c b/progs/glsl/texaaline.c
>index 2e4f932..63126f9 100644
>--- a/progs/glsl/texaaline.c
>+++ b/progs/glsl/texaaline.c
>@@ -14,10 +14,6 @@
> #include <GL/glew.h>
> #include <GL/glut.h>
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> static GLint WinWidth = 300, WinHeight = 300;
> static GLint win = 0;
> static GLfloat Width = 8.;
>diff --git a/progs/glsl/twoside.c b/progs/glsl/twoside.c
>index ce155d6..39e3f08 100644
>--- a/progs/glsl/twoside.c
>+++ b/progs/glsl/twoside.c
>@@ -16,10 +16,6 @@
> #include <GL/glut.h>
> #include "shaderutil.h"
> 
>-#ifndef M_PI
>-#define M_PI 3.1415926535
>-#endif
>-
> static GLint WinWidth = 300, WinHeight = 300;
> static char *FragProgFile = NULL;
> static char *VertProgFile = NULL;
>diff --git a/progs/objviewer/glm.c b/progs/objviewer/glm.c
>index 7f36cdf..74875ad 100644
>--- a/progs/objviewer/glm.c
>+++ b/progs/objviewer/glm.c
>@@ -21,11 +21,6 @@ typedef unsigned char boolean;
> #define FALSE 0
> 
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> /* defines */
> #define T(x) model->triangles[(x)]
> 
>diff --git a/progs/objviewer/glm.h b/progs/objviewer/glm.h
>index 8740b36..b282ff9 100644
>--- a/progs/objviewer/glm.h
>+++ b/progs/objviewer/glm.h
>@@ -13,11 +13,6 @@
> typedef unsigned int uint;
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> /* defines */
> #define GLM_NONE     (0)		/* render with only vertices */
> #define GLM_FLAT     (1 << 0)		/* render with facet normals */
>diff --git a/progs/redbook/torus.c b/progs/redbook/torus.c
>index 7ae4d41..76cca9d 100644
>--- a/progs/redbook/torus.c
>+++ b/progs/redbook/torus.c
>@@ -45,11 +45,6 @@
> #include <math.h>
> #include <stdlib.h>
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> GLuint theTorus;
> 
> /* Draw a torus */
>diff --git a/progs/tests/auxbuffer.c b/progs/tests/auxbuffer.c
>index 70f0b73..22d644a 100644
>--- a/progs/tests/auxbuffer.c
>+++ b/progs/tests/auxbuffer.c
>@@ -54,10 +54,6 @@ current_time(void)
> 
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
> static int WinWidth = 300, WinHeight = 300;
> static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
> static GLint gear1, gear2, gear3;
>diff --git a/progs/tests/jkrahntest.c b/progs/tests/jkrahntest.c
>index 3fef105..a767da6 100644
>--- a/progs/tests/jkrahntest.c
>+++ b/progs/tests/jkrahntest.c
>@@ -25,10 +25,6 @@
> #include <unistd.h>
> #include <math.h>
> 
>-#ifndef M_PI
>-#define M_PI 3.14159
>-#endif
>-
> #define DEGTOR (M_PI/180.0)
> 
> static int AttributeList[] = { GLX_RGBA, GLX_DOUBLEBUFFER, None };
>diff --git a/progs/windml/uglgears.c b/progs/windml/uglgears.c
>index 468fe89..9003b05 100644
>--- a/progs/windml/uglgears.c
>+++ b/progs/windml/uglgears.c
>@@ -26,10 +26,6 @@ Spinning gears demo
> #include <GL/uglmesa.h>
> #include <GL/glu.h>
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> #define COUNT_FRAMES
> 
> UGL_LOCAL UGL_EVENT_SERVICE_ID eventServiceId;
>diff --git a/progs/xdemos/corender.c b/progs/xdemos/corender.c
>index f2b8145..02e4ac0 100644
>--- a/progs/xdemos/corender.c
>+++ b/progs/xdemos/corender.c
>@@ -26,10 +26,6 @@
> #include "ipc.h"
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> static int MyID = 0;  /* 0 or 1 */
> static int WindowID = 0;
> static GLXContext Context = 0;
>diff --git a/progs/xdemos/glxcontexts.c b/progs/xdemos/glxcontexts.c
>index 9f83679..93a421f 100644
>--- a/progs/xdemos/glxcontexts.c
>+++ b/progs/xdemos/glxcontexts.c
>@@ -84,11 +84,6 @@ current_time(void)
> 
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
> static GLint gear1, gear2, gear3;
> static GLfloat angle = 0.0;
>diff --git a/progs/xdemos/glxgears.c b/progs/xdemos/glxgears.c
>index 088f25a..5936b2b 100644
>--- a/progs/xdemos/glxgears.c
>+++ b/progs/xdemos/glxgears.c
>@@ -85,11 +85,6 @@ current_time(void)
> 
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> /** Event handler results: */
> #define NOP 0
> #define EXIT 1
>diff --git a/progs/xdemos/glxgears_fbconfig.c b/progs/xdemos/glxgears_fbconfig.c
>index 2dac00b..3219062 100644
>--- a/progs/xdemos/glxgears_fbconfig.c
>+++ b/progs/xdemos/glxgears_fbconfig.c
>@@ -90,11 +90,6 @@ current_time(void)
> 
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
> static GLint gear1, gear2, gear3;
> static GLfloat angle = 0.0;
>diff --git a/progs/xdemos/glxgears_pixmap.c b/progs/xdemos/glxgears_pixmap.c
>index 661d130..beb5cdb 100644
>--- a/progs/xdemos/glxgears_pixmap.c
>+++ b/progs/xdemos/glxgears_pixmap.c
>@@ -84,11 +84,6 @@ current_time(void)
> 
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
> static GLint gear1, gear2, gear3;
> static GLfloat angle = 0.0;
>diff --git a/progs/xdemos/glxswapcontrol.c b/progs/xdemos/glxswapcontrol.c
>index cd60d46..a749b9f 100644
>--- a/progs/xdemos/glxswapcontrol.c
>+++ b/progs/xdemos/glxswapcontrol.c
>@@ -103,11 +103,6 @@ current_time(void)
> 
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
> static GLint gear1, gear2, gear3;
> static GLfloat angle = 0.0;
>diff --git a/progs/xdemos/multictx.c b/progs/xdemos/multictx.c
>index 75255b2..888fd92 100644
>--- a/progs/xdemos/multictx.c
>+++ b/progs/xdemos/multictx.c
>@@ -42,11 +42,6 @@
> 
> 
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265
>-#endif
>-
>-
> /** Event handler results: */
> #define NOP 0
> #define EXIT 1
>diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c b/src/gallium/drivers/i915/i915_fpc_translate.c
>index 379d47e..e6f2317 100644
>--- a/src/gallium/drivers/i915/i915_fpc_translate.c
>+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
>@@ -400,11 +400,6 @@ emit_simple_arith_swap2(struct i915_fp_compile *p,
>    emit_simple_arith(p, &inst2, opcode, numArgs);
> }
> 
>-
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> /*
>  * Translate TGSI instruction to i915 instruction.
>  *
>diff --git a/src/gallium/state_trackers/vega/arc.c b/src/gallium/state_trackers/vega/arc.c
>index e74c7f0..ef4e06e 100644
>--- a/src/gallium/state_trackers/vega/arc.c
>+++ b/src/gallium/state_trackers/vega/arc.c
>@@ -36,10 +36,6 @@
> 
> #include <math.h>
> 
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> #define DEBUG_ARCS 0
> 
> static const VGfloat two_pi = M_PI * 2;
>diff --git a/src/glu/mesa/glu.c b/src/glu/mesa/glu.c
>index f9e3398..c89b353 100644
>--- a/src/glu/mesa/glu.c
>+++ b/src/glu/mesa/glu.c
>@@ -36,10 +36,6 @@
>  * Miscellaneous utility functions
>  */
> 
>-
>-#ifndef M_PI
>-#define M_PI 3.1415926536
>-#endif
> #define EPS 0.00001
> 
> #ifndef GLU_INCOMPATIBLE_GL_VERSION
>diff --git a/src/glu/mesa/quadric.c b/src/glu/mesa/quadric.c
>index 0f6889b..2082171 100644
>--- a/src/glu/mesa/quadric.c
>+++ b/src/glu/mesa/quadric.c
>@@ -39,11 +39,6 @@
> 
> 
> 
>-#ifndef M_PI
>-#  define M_PI (3.1415926)
>-#endif
>-
>-
> /*
>  * Convert degrees to radians:
>  */
>diff --git a/src/glu/mini/glu.c b/src/glu/mini/glu.c
>index 31429e3..eefb7e5 100644
>--- a/src/glu/mini/glu.c
>+++ b/src/glu/mini/glu.c
>@@ -36,10 +36,6 @@
>  * Miscellaneous utility functions
>  */
> 
>-
>-#ifndef M_PI
>-#define M_PI 3.1415926536
>-#endif
> #define EPS 0.00001
> 
> #ifndef GLU_INCOMPATIBLE_GL_VERSION
>diff --git a/src/glu/mini/quadric.c b/src/glu/mini/quadric.c
>index 0484890..14d43ad 100644
>--- a/src/glu/mini/quadric.c
>+++ b/src/glu/mini/quadric.c
>@@ -39,11 +39,6 @@
> 
> 
> 
>-#ifndef M_PI
>-#  define M_PI (3.1415926)
>-#endif
>-
>-
> /*
>  * Convert degrees to radians:
>  */
>diff --git a/src/glut/beos/glut_shapes.c b/src/glut/beos/glut_shapes.c
>index ce5bebb..d281e66 100644
>--- a/src/glut/beos/glut_shapes.c
>+++ b/src/glut/beos/glut_shapes.c
>@@ -47,11 +47,6 @@ OpenGL(TM) is a trademark of Silicon Graphics, Inc.
> #include <math.h>
> #include "glutint.h"
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> static GLUquadricObj *quadObj;
> 
> #define QUAD_OBJ_INIT() { if(!quadObj) initQuadObj(); }
>diff --git a/src/glut/directfb/models.c b/src/glut/directfb/models.c
>index d96a8f5..c326f98 100644
>--- a/src/glut/directfb/models.c
>+++ b/src/glut/directfb/models.c
>@@ -50,11 +50,6 @@ OpenGL(TM) is a trademark of Silicon Graphics, Inc.
> 
> #include "internal.h"
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> static GLUquadricObj *quadObj;
> 
> #define QUAD_OBJ_INIT() { if(!quadObj) initQuadObj(); }
>diff --git a/src/glut/glx/glut_shapes.c b/src/glut/glx/glut_shapes.c
>index 20e2102..b8947ed 100644
>--- a/src/glut/glx/glut_shapes.c
>+++ b/src/glut/glx/glut_shapes.c
>@@ -47,11 +47,6 @@ OpenGL(TM) is a trademark of Silicon Graphics, Inc.
> #include <math.h>
> #include "glutint.h"
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> static GLUquadricObj *quadObj;
> 
> #define QUAD_OBJ_INIT() { if(!quadObj) initQuadObj(); }
>diff --git a/src/glut/mini/models.c b/src/glut/mini/models.c
>index 3f955b8..a0156ad 100644
>--- a/src/glut/mini/models.c
>+++ b/src/glut/mini/models.c
>@@ -49,11 +49,6 @@ OpenGL(TM) is a trademark of Silicon Graphics, Inc.
> #include <GL/glu.h>
> #include "GL/glut.h"
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> static GLUquadricObj *quadObj;
> 
> #define QUAD_OBJ_INIT() { if(!quadObj) initQuadObj(); }
>diff --git a/src/glut/os2/glut_shapes.cpp b/src/glut/os2/glut_shapes.cpp
>index 111e2d4..d4848b0 100644
>--- a/src/glut/os2/glut_shapes.cpp
>+++ b/src/glut/os2/glut_shapes.cpp
>@@ -47,11 +47,6 @@ OpenGL(TM) is a trademark of Silicon Graphics, Inc.
> #include <math.h>
> #include "glutint.h"
> 
>-/* Some <math.h> files do not define M_PI... */
>-#ifndef M_PI
>-#define M_PI 3.14159265358979323846
>-#endif
>-
> static GLUquadricObj *quadObj;
> 
> #define QUAD_OBJ_INIT() { if(!quadObj) initQuadObj(); }
>-- 
>1.6.4.2
>

Actions: View | Splinter Review

Attachments on bug 24318: 30074 | 30659 | 30660 | 35298 | 35299 | 37144

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.