X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_teapot.c;h=2faa851140379081eb49df7c1df05f05c54161fe;hb=1c741248e3ad67f24a57742cb5cc511f0ee87805;hp=edbfcaa5b2cb9610cd8cd1f20d4292044a934e95;hpb=3997d5a97e09f007f544bb6c524387047d7d56c7;p=freeglut

diff --git a/src/freeglut_teapot.c b/src/freeglut_teapot.c
index edbfcaa..2faa851 100644
--- 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,10 +177,9 @@ static void teapot( GLint grid, GLdouble scale, GLenum type )
  */
 void FGAPIENTRY glutWireTeapot( GLdouble size )
 {
-    /*
-     * We will use the general teapot rendering code
-     */
-    teapot( 10, size, GL_LINE );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWireTeapot" );
+    /* We will use the general teapot rendering code */
+    fghTeapot( 10, size, GL_LINE );
 }
 
 /*
@@ -193,10 +187,9 @@ void FGAPIENTRY glutWireTeapot( GLdouble size )
  */
 void FGAPIENTRY glutSolidTeapot( GLdouble size )
 {
-    /*
-     * We will use the general teapot rendering code
-     */
-    teapot( 7, size, GL_FILL );
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSolidTeapot" );
+    /* We will use the general teapot rendering code */
+    fghTeapot( 7, size, GL_FILL );
 }
 
 /*** END OF FILE ***/