Cleaned up the #define's for when GLU is not available

include/osgUtil/SceneGraphBuilder

@@ -21,8 +21,6 @@
 
 #include <osgUtil/Export>
 
-namespace osgUtil {
-
 #ifndef OSG_GLU_AVAILABLE
     // as we have no GLU we'll just define the required enum values
     #define GLU_FALSE           0
@@ -36,6 +34,8 @@ namespace osgUtil {
     #define GLU_SILHOUETTE      100013
 #endif
 
+namespace osgUtil {
+
 /** A class for assisting the building ascene graphs that is equivilant to OpenGL 1.0 style calls.
   */
 class OSGUTIL_EXPORT SceneGraphBuilder

include/osgUtil/Tessellator

@@ -22,11 +22,18 @@
 
 #include <vector>
 
-/* Win32 calling conventions. (or a least thats what the GLUT example tess.c uses.)*/
 #ifndef CALLBACK
-#define CALLBACK
+    /* Win32 calling conventions. (or a least thats what the GLUT example tess.c uses.)*/
+    #define CALLBACK
 #endif
 
+#ifndef OSG_GLU_AVAILABLE
+    #define GLU_TESS_WINDING_ODD                100130
+    #define GLU_TESS_WINDING_NONZERO            100131
+    #define GLU_TESS_WINDING_POSITIVE           100132
+    #define GLU_TESS_WINDING_NEGATIVE           100133
+    #define GLU_TESS_WINDING_ABS_GEQ_TWO        100134
+#endif
 
 namespace osgUtil {
 
@@ -42,23 +49,14 @@ class OSGUTIL_EXPORT Tessellator : public osg::Referenced
         ~Tessellator();
 
         /** The winding rule, see red book ch 11. */
-#ifdef OSG_GLU_AVAILABLE
         enum WindingType{
             TESS_WINDING_ODD          = GLU_TESS_WINDING_ODD,
-            TESS_WINDING_NONZERO      = GLU_TESS_WINDING_NONZERO     ,
-            TESS_WINDING_POSITIVE     = GLU_TESS_WINDING_POSITIVE    ,
-            TESS_WINDING_NEGATIVE     = GLU_TESS_WINDING_NEGATIVE    ,
-            TESS_WINDING_ABS_GEQ_TWO  =    GLU_TESS_WINDING_ABS_GEQ_TWO
+            TESS_WINDING_NONZERO      = GLU_TESS_WINDING_NONZERO,
+            TESS_WINDING_POSITIVE     = GLU_TESS_WINDING_POSITIVE,
+            TESS_WINDING_NEGATIVE     = GLU_TESS_WINDING_NEGATIVE,
+            TESS_WINDING_ABS_GEQ_TWO  = GLU_TESS_WINDING_ABS_GEQ_TWO
         } ;
-#else
-        enum WindingType{
-            TESS_WINDING_ODD,
-            TESS_WINDING_NONZERO,
-            TESS_WINDING_POSITIVE,
-            TESS_WINDING_NEGATIVE,
-            TESS_WINDING_ABS_GEQ_TWO
-        } ;
-#endif
+
         /** we interpret all contours in the geometry as a single set to be tessellated or
          * each separate drawable's contours needs to be tessellated. */
         enum TessellationType {