From: John F. Fay <johnffay@nettally.com>
Date: Sun, 1 Apr 2012 20:09:51 +0000 (+0000)
Subject: Removing the build errors and a build warning that crept in for MSVC 6.0.  There... 
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=8ee5d611ce7eb724a108781b67cacbae6715abde;hp=89c10add21c011ad2070c8e8a939841392663844;p=freeglut

Removing the build errors and a build warning that crept in for MSVC 6.0.  There remain the undefined functions "sinf" and "cosf".

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1231 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/src/fg_geometry.c b/src/fg_geometry.c
index eb96b92..312acfc 100644
--- a/src/fg_geometry.c
+++ b/src/fg_geometry.c
@@ -72,7 +72,9 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n
 {
     GLuint vbo_coords, vbo_normals;
     GLuint numVertices = numFaces * numEdgePerFace;
-    
+
+    int i;
+
     if (numVertices > 0 && attribute_v_coord != -1) {
 	    fghGenBuffers(1, &vbo_coords);
 	    fghBindBuffer(FGH_ARRAY_BUFFER, vbo_coords);
@@ -113,9 +115,6 @@ static void fghDrawGeometryWire20(GLfloat *vertices, GLfloat *normals, GLsizei n
         );
     }
 
-
-    int i;
-    
     /* Draw per face (TODO: could use glMultiDrawArrays if available) */
     for (i=0; i<numFaces; i++)
 	glDrawArrays(GL_LINE_LOOP, i*numEdgePerFace, numEdgePerFace);
diff --git a/src/fg_init.c b/src/fg_init.c
index 74c4649..68b69ca 100644
--- a/src/fg_init.c
+++ b/src/fg_init.c
@@ -102,6 +102,7 @@ extern void fgPlatformInitialize( const char* displayName );
 extern void fgPlatformDeinitialiseInputDevices ( void );
 extern void fgPlatformCloseDisplay ( void );
 extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
+extern void fgInitGL2();
 
 
 void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )