Allowing compilation of Windows version by removing DLL decorations from deprecated...

[freeglut] / src / freeglut_teapot.c

diff --git a/src/freeglut_teapot.c b/src/freeglut_teapot.c
index 3a5d3f6..2faa851 100644 (file)
--- a/src/freeglut_teapot.c
+++ b/src/freeglut_teapot.c
@@ -72,19 +72,14 @@
  * OpenGL(TM) is a trademark of Silicon Graphics, Inc.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
-
 #include "freeglut_teapot_data.h"
 
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */
 
 
-static void teapot( GLint grid, GLdouble scale, GLenum type )
+static void fghTeapot( GLint grid, GLdouble scale, GLenum type )
 {
 #if TARGET_HOST_WINCE
                int i, numV=sizeof(strip_vertices)/4, numI=sizeof(strip_normals)/4;
@@ -182,8 +177,9 @@ static void teapot( GLint grid, GLdouble scale, GLenum type )
  */
 void FGAPIENTRY glutWireTeapot( GLdouble size )
 {
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireTeapot" );
     /* We will use the general teapot rendering code */
-    teapot( 10, size, GL_LINE );
+    fghTeapot( 10, size, GL_LINE );
 }
 
 /*
@@ -191,8 +187,9 @@ void FGAPIENTRY glutWireTeapot( GLdouble size )
  */
 void FGAPIENTRY glutSolidTeapot( GLdouble size )
 {
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidTeapot" );
     /* We will use the general teapot rendering code */
-    teapot( 7, size, GL_FILL );
+    fghTeapot( 7, size, GL_FILL );
 }
 
 /*** END OF FILE ***/