From 8640929a2e3f00281c75d9be5dc40ac8b152de0a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 14 Oct 2010 11:10:16 +0000
Subject: [PATCH] From Brad Christiansen, fix function entry points under
 Windows to address crash

---
 include/osg/GLU            | 22 +++++++++++-----------
 src/osg/glu/libtess/tess.h |  5 ++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/include/osg/GLU b/include/osg/GLU
index 27c513a95..d86bf4d25 100644
--- a/include/osg/GLU
+++ b/include/osg/GLU
@@ -168,18 +168,18 @@ typedef GLUtesselator GLUtriangulatorObj;
 typedef void (GL_APIENTRY * _GLUfuncptr)();
 typedef void (GL_APIENTRY * GLU_TESS_CALLBACK)();
 
-extern OSG_EXPORT GLUtesselator* gluNewTess (void);
-extern OSG_EXPORT void gluDeleteTess (GLUtesselator* tess);
+extern OSG_EXPORT GLUtesselator* GL_APIENTRY gluNewTess (void);
+extern OSG_EXPORT void GL_APIENTRY gluDeleteTess (GLUtesselator* tess);
 
-extern OSG_EXPORT void gluTessBeginContour (GLUtesselator* tess);
-extern OSG_EXPORT void gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
-extern OSG_EXPORT void gluTessEndContour (GLUtesselator* tess);
-extern OSG_EXPORT void gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
-extern OSG_EXPORT void gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
-extern OSG_EXPORT void gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
-extern OSG_EXPORT void gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
-extern OSG_EXPORT void gluTessEndPolygon (GLUtesselator* tess);
-extern OSG_EXPORT void gluGetTessProperty( GLUtesselator *tess, GLenum which, GLdouble *value );
+extern OSG_EXPORT void GL_APIENTRY gluTessBeginContour (GLUtesselator* tess);
+extern OSG_EXPORT void GL_APIENTRY gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
+extern OSG_EXPORT void GL_APIENTRY gluTessEndContour (GLUtesselator* tess);
+extern OSG_EXPORT void GL_APIENTRY gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
+extern OSG_EXPORT void GL_APIENTRY gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
+extern OSG_EXPORT void GL_APIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
+extern OSG_EXPORT void GL_APIENTRY gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
+extern OSG_EXPORT void GL_APIENTRY gluTessEndPolygon (GLUtesselator* tess);
+extern OSG_EXPORT void GL_APIENTRY gluGetTessProperty( GLUtesselator *tess, GLenum which, GLdouble *value );
 
 }
 
diff --git a/src/osg/glu/libtess/tess.h b/src/osg/glu/libtess/tess.h
index d9594f363..7a10b14d9 100644
--- a/src/osg/glu/libtess/tess.h
+++ b/src/osg/glu/libtess/tess.h
@@ -37,9 +37,8 @@
 
 // #include <GL/glu.h>
 #include <osg/GLU>
-
-// simply define GLAPIENTRY as nothing so that we can keep function signatures the same as declaration.
-#define GLAPIENTRY
+ 
+#define GLAPIENTRY GL_APIENTRY 
 
 #include <setjmp.h>
 #include "mesh.h"