include: Add a glu.h header.

dlls/glu32/glu.c

@@ -26,14 +26,12 @@
 #include "winbase.h"
 
 #include "wine/wgl.h"
+#include "wine/glu.h"
 #include "wine/library.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(glu);
 
-typedef struct GLUnurbs GLUnurbs;
-typedef struct GLUquadric GLUquadric;
-typedef struct GLUtesselator GLUtesselator;
 typedef void (*_GLUfuncptr)(void);
 
 /* The only non-trivial bit of this is the *Tess* functions.  Here we
@@ -61,30 +59,6 @@ typedef struct {
     void (CALLBACK *cb_tess_combine_data)(double *, void *, float *, void **, void *);
 } wine_GLUtesselator;
 
-#define GLU_TESS_BEGIN          100100
-#define GLU_TESS_VERTEX         100101
-#define GLU_TESS_END            100102
-#define GLU_TESS_ERROR          100103
-#define GLU_TESS_EDGE_FLAG      100104
-#define GLU_TESS_COMBINE        100105
-#define GLU_TESS_BEGIN_DATA     100106
-#define GLU_TESS_VERTEX_DATA    100107
-#define GLU_TESS_END_DATA       100108
-#define GLU_TESS_ERROR_DATA     100109
-#define GLU_TESS_EDGE_FLAG_DATA 100110
-#define GLU_TESS_COMBINE_DATA   100111
-
-#define GLU_VERSION    100800
-#define GLU_EXTENSIONS 100801
-
-#define GLU_INVALID_ENUM            100900
-#define GLU_INVALID_VALUE           100901
-#define GLU_OUT_OF_MEMORY           100902
-#define GLU_INCOMPATIBLE_GL_VERSION 100903
-
-#define GLU_TRUE  GL_TRUE
-#define GLU_FALSE GL_FALSE
-
 static void  (*p_gluBeginCurve)( GLUnurbs* nurb );
 static void  (*p_gluBeginSurface)( GLUnurbs* nurb );
 static void  (*p_gluBeginTrim)( GLUnurbs* nurb );

dlls/opengl32/wgl.c

@@ -38,6 +38,7 @@
 #include "wine/wglext.h"
 #include "wine/gdi_driver.h"
 #include "wine/wgl_driver.h"
+#include "wine/glu.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wgl);
@@ -1394,24 +1395,19 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase
     return wglUseFontBitmaps_common( hdc, first, count, listBase, TRUE );
 }
 
-/* FIXME: should probably have a glu.h header */
-
-typedef struct GLUtesselator GLUtesselator;
 typedef void (WINAPI *_GLUfuncptr)(void);
 
-#define GLU_TESS_BEGIN  100100
-#define GLU_TESS_VERTEX 100101
-#define GLU_TESS_END    100102
-
-static GLUtesselator * (WINAPI *pgluNewTess)(void);
-static void (WINAPI *pgluDeleteTess)(GLUtesselator *tess);
-static void (WINAPI *pgluTessNormal)(GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z);
-static void (WINAPI *pgluTessBeginPolygon)(GLUtesselator *tess, void *polygon_data);
-static void (WINAPI *pgluTessEndPolygon)(GLUtesselator *tess);
-static void (WINAPI *pgluTessCallback)(GLUtesselator *tess, GLenum which, _GLUfuncptr fn);
-static void (WINAPI *pgluTessBeginContour)(GLUtesselator *tess);
-static void (WINAPI *pgluTessEndContour)(GLUtesselator *tess);
-static void (WINAPI *pgluTessVertex)(GLUtesselator *tess, GLdouble *location, GLvoid* data);
+#define DECL_FUNCPTR(f) static typeof(f) *p##f
+DECL_FUNCPTR(gluNewTess);
+DECL_FUNCPTR(gluDeleteTess);
+DECL_FUNCPTR(gluTessNormal);
+DECL_FUNCPTR(gluTessBeginPolygon);
+DECL_FUNCPTR(gluTessEndPolygon);
+DECL_FUNCPTR(gluTessCallback);
+DECL_FUNCPTR(gluTessBeginContour);
+DECL_FUNCPTR(gluTessEndContour);
+DECL_FUNCPTR(gluTessVertex);
+#undef DECL_FUNCPTR
 
 static HMODULE load_libglu(void)
 {