* const warning fixes. formatting fixes (squash them tabs)

modules/video_output/opengl.c

@@ -90,13 +90,13 @@
 #define OPENGL_EFFECT_NONE             1
 #define OPENGL_EFFECT_CUBE             2
 #define OPENGL_EFFECT_TRANSPARENT_CUBE 4
-#if defined( HAVE_GL_GLU_H ) || defined( SYS_DARWIN )
+#if defined( HAVE_GL_GLU_H ) || defined( __APPLE__ )
     #define OPENGL_MORE_EFFECT           8
 #endif
 
 #ifdef OPENGL_MORE_EFFECT
     #include <math.h>
-	#ifdef SYS_DARWIN
+    #ifdef __APPLE__
         #include <OpenGL/glu.h>
     #else
         #include <GL/glu.h>
@@ -116,9 +116,9 @@
     #define SIGN(x)     (x < 0 ? (-1) : 1)
     #define PID2     1.570796326794896619231322
 
-	static char *ppsz_effects[] = {
+    static const char *ppsz_effects[] = {
             "none", "cube", "transparent-cube", "cylinder", "torus", "sphere","SQUAREXY","SQUARER", "ASINXY", "ASINR", "SINEXY", "SINER" };
-	static char *ppsz_effects_text[] = {
+    static const char *ppsz_effects_text[] = {
             N_("None"), N_("Cube"), N_("Transparent Cube"), 
             N_("Cylinder"), N_("Torus"), N_("Sphere"), N_("SQUAREXY"),N_("SQUARER"), N_("ASINXY"), N_("ASINR"), N_("SINEXY"), N_("SINER") };
 #endif
@@ -137,14 +137,17 @@ static int  Control      ( vout_thread_t *, int, va_list );
 
 static inline int GetAlignedSize( int );
 
-static int InitTextures( vout_thread_t * );
-static int SendEvents( vlc_object_t *, char const *,
+static int InitTextures  ( vout_thread_t * );
+static int SendEvents    ( vlc_object_t *, char const *,
                            vlc_value_t, vlc_value_t, void * );
 
+#ifdef OPENGL_MORE_EFFECT                       
+static float Z_Compute   ( float, int, float, float );
+static void Transform    ( float, int, float, float, int, int, int, int, double *, double * );
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#ifdef OPENGL_MORE_EFFECT
 #define ACCURACY_TEXT N_( "OpenGL sampling accuracy " )
 #define ACCURACY_LONGTEXT N_( "Select the accuracy of 3D object sampling(1 = min and 10 = max)" )
 #define RADIUS_TEXT N_( "OpenGL Cylinder radius" )
@@ -167,9 +170,9 @@ static int SendEvents( vlc_object_t *, char const *,
     "Several visual OpenGL effects are available." )
 
 #ifndef OPENGL_MORE_EFFECT
-static char *ppsz_effects[] = {
+static const char *ppsz_effects[] = {
         "none", "cube", "transparent-cube" };
-static char *ppsz_effects_text[] = {
+static const char *ppsz_effects_text[] = {
         N_("None"), N_("Cube"), N_("Transparent Cube") };
 #endif
 
@@ -741,7 +744,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
 /*****************************************************************************
  *   Transform: Calculate the distorted grid coordinates
  *****************************************************************************/
-void Transform(float p, int distortion, float width, float height,int i, int j, int i_visible_width, int i_visible_height, double *ix,double *iy)
+static void Transform(float p, int distortion, float width, float height,int i, int j, int i_visible_width, int i_visible_height, double *ix,double *iy)
 {
     double x,y,xnew,ynew;
     double r,theta,rnew,thetanew;
@@ -799,11 +802,10 @@ void Transform(float p, int distortion, float width, float height,int i, int j,
     *iy = height * (ynew + 1) / (2.0);
 }
 
-
 /*****************************************************************************
  *   Z_Compute: Calculate the Z-coordinate
  *****************************************************************************/
-float Z_Compute(float p, int distortion, float x, float y)
+static float Z_Compute(float p, int distortion, float x, float y)
 {
     float f_z = 0.0;
     double d_p = p / 100.0;