massive reduction of unneeded files

27 files changed, 0 insertions, 7100 deletions

diff --git a/nx-X11/extras/Mesa/include/GL/Makefile.am b/nx-X11/extras/Mesa/include/GL/Makefile.am
deleted file mode 100644
index 199bd5c8f..000000000
--- a/nx-X11/extras/Mesa/include/GL/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-GLincludedir = $(includedir)/GL
-
-INC_FX = fxmesa.h
-INC_GGI = ggimesa.h
-INC_OSMESA = osmesa.h
-INC_SVGA = svgamesa.h
-INC_X11 = glx.h glxext.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
-INC_GLUT = glut.h glutf90.h
-
-if HAVE_FX
-sel_inc_fx = $(INC_FX)
-endif
-
-if HAVE_GGI
-sel_inc_ggi = $(INC_GGI)
-endif
-
-if HAVE_OSMESA
-sel_inc_osmesa = $(INC_OSMESA)
-endif
-
-if HAVE_SVGA
-sel_inc_svga = $(INC_SVGA)
-endif
-
-if HAVE_X11
-sel_inc_x11 = $(INC_X11)
-endif
-
-if NEED_GLUT
-sel_inc_glut = $(INC_GLUT)
-endif
-
-EXTRA_HEADERS = amesa.h dosmesa.h foomesa.h glut_h.dja mesa_wgl.h mglmesa.h \
-	vms_x_fix.h wmesa.h \
-	$(INC_FX) $(INC_GGI) $(INC_OSMESA) $(INC_SVGA) $(INC_X11) $(INC_GLUT)
-
-GLinclude_HEADERS = gl.h glext.h gl_mangle.h glu.h glu_mangle.h \
-	$(sel_inc_fx) $(sel_inc_ggi) $(sel_inc_osmesa) $(sel_inc_svga) \
-	$(sel_inc_x11) $(sel_inc_glut)
-include $(top_srcdir)/common_rules.make
diff --git a/nx-X11/extras/Mesa/include/GL/amesa.h b/nx-X11/extras/Mesa/include/GL/amesa.h
deleted file mode 100644
index 852d34cf4..000000000
--- a/nx-X11/extras/Mesa/include/GL/amesa.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.3
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-/* Allegro (DJGPP) driver by Bernhard Tschirren (bernie-t@geocities.com) */
-
-
-#ifndef AMESA_H
-#define AMESA_H
-
-
-#define AMESA_MAJOR_VERSION 3
-#define AMESA_MINOR_VERSION 3
-
-
-typedef struct amesa_visual  *AMesaVisual;
-typedef struct amesa_buffer  *AMesaBuffer;
-typedef struct amesa_context *AMesaContext;
-
-
-extern AMesaVisual AMesaCreateVisual(GLboolean dbFlag, GLint depth,
-                                     GLint depthSize,
-                                     GLint stencilSize,
-                                     GLint accumSize);
-
-extern void AMesaDestroyVisual(AMesaVisual visual);
-
-extern AMesaBuffer AMesaCreateBuffer(AMesaVisual visual,
-                                     GLint width, GLint height);
-
-extern void AMesaDestroyBuffer(AMesaBuffer buffer);
-
-
-extern AMesaContext AMesaCreateContext(AMesaVisual visual,
-                                       AMesaContext sharelist);
-
-extern void AMesaDestroyContext(AMesaContext context);
-
-extern GLboolean AMesaMakeCurrent(AMesaContext context, AMesaBuffer buffer);
-
-extern void AMesaSwapBuffers(AMesaBuffer buffer);
-
-
-#endif /* AMESA_H */
diff --git a/nx-X11/extras/Mesa/include/GL/directfbgl.h b/nx-X11/extras/Mesa/include/GL/directfbgl.h
deleted file mode 100644
index 984c4b142..000000000
--- a/nx-X11/extras/Mesa/include/GL/directfbgl.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-   (c) Copyright 2001  convergence integrated media GmbH.
-   All rights reserved.
-
-   Written by Denis Oliver Kropp <dok@convergence.de> and
-              Andreas Hundt <andi@convergence.de>.
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __DIRECTFBGL_H__
-#define __DIRECTFBGL_H__
-
-#include <directfb.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-typedef struct {
-     int        buffer_size;
-     int        depth_size;
-     int        stencil_size;
-     int        aux_buffers;
-    
-     int        red_size;
-     int        green_size;
-     int        blue_size;
-     int        alpha_size;
-
-     int        accum_red_size;
-     int        accum_green_size;
-     int        accum_blue_size;
-     int        accum_alpha_size;
-
-     DFBBoolean double_buffer;
-     DFBBoolean stereo;
-} DFBGLAttributes;
-
-
-DEFINE_INTERFACE(   IDirectFBGL,
-
-   /** Context handling **/
-
-     /*
-      * Acquire the hardware lock.
-      */
-     DFBResult (*Lock) (
-          IDirectFBGL              *thiz
-     );
-
-     /*
-      * Release the lock.
-      */
-     DFBResult (*Unlock) (
-          IDirectFBGL              *thiz
-     );
-
-     /*
-      * Query the OpenGL attributes.
-      */
-     DFBResult (*GetAttributes) (
-          IDirectFBGL              *thiz,
-          DFBGLAttributes          *attributes
-     );
-)
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/nx-X11/extras/Mesa/include/GL/dmesa.h b/nx-X11/extras/Mesa/include/GL/dmesa.h
deleted file mode 100644
index e67b3426f..000000000
--- a/nx-X11/extras/Mesa/include/GL/dmesa.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.1
- * 
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * DOS/DJGPP device driver v1.7 for Mesa
- *
- *  Copyright (C) 2002 - Daniel Borca
- *  Email : dborca@users.sourceforge.net
- *  Web   : http://www.geocities.com/dborca
- */
-
-
-#ifndef DMESA_H_included
-#define DMESA_H_included
-
-#define DMESA_MAJOR_VERSION 6
-#define DMESA_MINOR_VERSION 3
-
-/* Sample Usage:
- *
- * 1. Call DMesaCreateVisual() to initialize graphics.
- * 2. Call DMesaCreateContext() to create a DMesa rendering context.
- * 3. Call DMesaCreateBuffer() to define the window.
- * 4. Call DMesaMakeCurrent() to bind the DMesaBuffer to a DMesaContext.
- * 5. Make gl* calls to render your graphics.
- * 6. Use DMesaSwapBuffers() when double buffering to swap front/back buffers.
- * 7. Before exiting, destroy DMesaBuffer, DMesaContext and DMesaVisual.
- */
-
-typedef struct dmesa_context *DMesaContext;
-typedef struct dmesa_visual *DMesaVisual;
-typedef struct dmesa_buffer *DMesaBuffer;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Create a new Visual and set graphics mode.
- */
-DMesaVisual DMesaCreateVisual (GLint width,        /* X res */
-                               GLint height,       /* Y res */
-                               GLint colDepth,     /* BPP */
-                               GLint refresh,      /* refresh rate: 0=default */
-                               GLboolean dbFlag,   /* double-buffered */
-                               GLboolean rgbFlag,  /* RGB mode */
-                               GLint alphaSize,    /* requested bits/alpha */
-                               GLint depthSize,    /* requested bits/depth */
-                               GLint stencilSize,  /* requested bits/stencil */
-                               GLint accumSize);   /* requested bits/accum */
-
-/*
- * Destroy Visual and restore screen.
- */
-void DMesaDestroyVisual (DMesaVisual v);
-
-
-
-/*
- * Create a new Context for rendering.
- */
-DMesaContext DMesaCreateContext (DMesaVisual visual, DMesaContext share);
-
-/*
- * Destroy Context.
- */
-void DMesaDestroyContext (DMesaContext c);
-
-/*
- * Return a handle to the current context.
- */
-DMesaContext DMesaGetCurrentContext (void);
-
-
-
-/*
- * Create a new Buffer (window).
- */
-DMesaBuffer DMesaCreateBuffer (DMesaVisual visual,
-                               GLint xpos, GLint ypos,
-                               GLint width, GLint height);
-
-/*
- * Destroy Buffer.
- */
-void DMesaDestroyBuffer (DMesaBuffer b);
-
-/*
- * Return a handle to the current buffer.
- */
-DMesaBuffer DMesaGetCurrentBuffer (void);
-
-/*
- * Swap the front and back buffers for the given Buffer.
- * No action is taken if the buffer is not double buffered.
- */
-void DMesaSwapBuffers (DMesaBuffer b);
-
-/*
- * Bind Buffer to Context and make the Context the current one.
- */
-GLboolean DMesaMakeCurrent (DMesaContext c, DMesaBuffer b);
-
-
-
-/*
- * Move/Resize current Buffer.
- */
-GLboolean DMesaMoveBuffer (GLint xpos, GLint ypos);
-GLboolean DMesaResizeBuffer (GLint width, GLint height);
-
-/*
- * Set palette index, using normalized values.
- */
-void DMesaSetCI (int ndx, GLfloat red, GLfloat green, GLfloat blue);
-
-/*
- * DMesa functions
- */
-typedef void (*DMesaProc) (void);
-DMesaProc DMesaGetProcAddress (const char *name);
-
-/*
- * DMesa state retrieval.
- */
-#define DMESA_GET_SCREEN_SIZE 0x0100
-#define DMESA_GET_DRIVER_CAPS 0x0200
-#define DMESA_GET_VIDEO_MODES 0x0300
-#define DMESA_GET_BUFFER_ADDR 0x0400
-
-#define DMESA_DRIVER_SWDB_BIT 0x1 /* software double-buffered */
-#define DMESA_DRIVER_LLWO_BIT 0x2 /* lower-left window origin */
-int DMesaGetIntegerv (GLenum pname, GLint *params);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/foomesa.h b/nx-X11/extras/Mesa/include/GL/foomesa.h
deleted file mode 100644
index 8517d8838..000000000
--- a/nx-X11/extras/Mesa/include/GL/foomesa.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.0
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-/*
- * Example Foo/Mesa interface.  See src/ddsample.c for more info.
- */
-
-
-
-#ifndef FOOMESA_H
-#define FOOMESA_H
-
-
-
-typedef struct foo_mesa_visual  *FooMesaVisual;
-
-typedef struct foo_mesa_buffer  *FooMesaBuffer;
-
-typedef struct foo_mesa_context *FooMesaContext;
-
-
-
-#ifdef BEOS
-#pragma export on
-#endif
-
-
-extern FooMesaVisual FooMesaChooseVisual( /* your params */ );
-
-extern void FooMesaDestroyVisual( FooMesaVisual visual );
-
-
-extern FooMesaBuffer FooMesaCreateBuffer( FooMesaVisual visual,
-                                          void *your_window_id );
-
-extern void FooMesaDestroyBuffer( FooMesaBuffer buffer );
-
-
-extern FooMesaContext FooMesaCreateContext( FooMesaVisual visual,
-                                            FooMesaContext sharelist );
-
-extern void FooMesaDestroyContext( FooMesaContext context );
-
-
-extern void FooMesaMakeCurrent( FooMesaContext context, FooMesaBuffer buffer );
-
-
-extern void FooMesaSwapBuffers( FooMesaBuffer buffer );
-
-
-/* Probably some more functions... */
-
-
-#ifdef BEOS
-#pragma export off
-#endif
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/fxmesa.h b/nx-X11/extras/Mesa/include/GL/fxmesa.h
deleted file mode 100644
index f8e9661f9..000000000
--- a/nx-X11/extras/Mesa/include/GL/fxmesa.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  4.0
- * Copyright (C) 1995-2001  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-/*
- * FXMesa - 3Dfx Glide driver for Mesa.  Contributed by David Bucciarelli
- *
- * NOTE: This version requires Glide3 (http://sourceforge.net/projects/glide)
- */
-
-
-#ifndef FXMESA_H
-#define FXMESA_H
-
-
-#include <glide.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define FXMESA_MAJOR_VERSION 6
-#define FXMESA_MINOR_VERSION 3
-
-
-/*
- * Values for attribList parameter to fxMesaCreateContext():
- */
-#define FXMESA_NONE		0	/* to terminate attribList */
-#define FXMESA_DOUBLEBUFFER	10
-#define FXMESA_ALPHA_SIZE	11      /* followed by an integer */
-#define FXMESA_DEPTH_SIZE	12      /* followed by an integer */
-#define FXMESA_STENCIL_SIZE	13      /* followed by an integer */
-#define FXMESA_ACCUM_SIZE	14      /* followed by an integer */
-#define FXMESA_COLORDEPTH	20      /* followed by an integer */
-#define FXMESA_SHARE_CONTEXT 990099	/* keep in sync with xmesa1.c! */
-
-
-
-typedef struct tfxMesaContext *fxMesaContext;
-
-
-#if defined (__BEOS__)
-#pragma export on
-#endif
-
-
-GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win, GrScreenResolution_t,
-						  GrScreenRefresh_t,
-						  const GLint attribList[]);
-
-GLAPI fxMesaContext GLAPIENTRY fxMesaCreateBestContext(GLuint win,
-						      GLint width, GLint height,
-						      const GLint attribList[]);
-GLAPI void GLAPIENTRY fxMesaDestroyContext(fxMesaContext ctx);
-
-GLAPI GLint GLAPIENTRY fxMesaSelectCurrentBoard(int n);
-
-GLAPI void GLAPIENTRY fxMesaMakeCurrent(fxMesaContext ctx);
-
-GLAPI fxMesaContext GLAPIENTRY fxMesaGetCurrentContext(void);
-
-GLAPI void GLAPIENTRY fxMesaSwapBuffers(void);
-
-GLAPI void GLAPIENTRY fxMesaSetNearFar(GLfloat nearVal, GLfloat farVal);
-
-GLAPI void GLAPIENTRY fxMesaUpdateScreenSize(fxMesaContext ctx);
-
-GLAPI void GLAPIENTRY fxCloseHardware(void);
-
-GLAPI void GLAPIENTRY fxGetScreenGeometry (GLint *w, GLint *h);
-
-
-#if defined (__BEOS__)
-#pragma export off
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/ggimesa.h b/nx-X11/extras/Mesa/include/GL/ggimesa.h
deleted file mode 100644
index 90e0b4222..000000000
--- a/nx-X11/extras/Mesa/include/GL/ggimesa.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Mesa 3-D graphics library GGI bindings (GGIGL [giggle])
- * Version:  4.0
- * Copyright (C) 1995-2000  Brian Paul
- * Copyright (C) 1998  Uwe Maurer
- * Copyrigth (C) 2001 Filip Spacek
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#ifndef GGIMESA_H
-#define GGIMESA_H
-
-#define GGIMESA_MAJOR_VERSION 4
-#define GGIMESA_MINOR_VERSION 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ggi/ggi.h>
-#include "GL/gl.h"
-  
-typedef struct ggi_mesa_context *ggi_mesa_context_t;
-
-/*
- * Initialize Mesa GGI extension
- */
-int ggiMesaInit(void);
-/*
- * Clean up Mesa GGI exension
- */
-int ggiMesaExit(void);
-
-/*
- * Attach Mesa GGI extension to the visual 'vis'
- */
-int ggiMesaAttach(ggi_visual_t vis);
-/*
- * Detach Mesa GGI extension from the visual 'vis'
- */
-int ggiMesaDetach(ggi_visual_t vis);
-
-int ggiMesaExtendVisual(ggi_visual_t vis, GLboolean alpha_flag,
-			GLboolean stereo_flag, GLint depth_size,
-			GLint stencil_size, GLint accum_red_size,
-			GLint accum_green_size, GLint accum_blue_size,
-			GLint accum_alpha_size, GLint num_samples);
-
-/*
- * Create a new context capable of displaying on the visual vis.
- */
-ggi_mesa_context_t ggiMesaCreateContext(ggi_visual_t vis);
-/*
- * Destroy the context 'ctx'
- */
-void ggiMesaDestroyContext(ggi_mesa_context_t ctx);
-
-/*
- * Make context 'ctx' the current context and bind it to visual 'vis'.
- * Note that the context must have been created with respect to that visual.
- */
-void ggiMesaMakeCurrent(ggi_mesa_context_t ctx, ggi_visual_t vis);
-
-void ggiMesaSwapBuffers(void);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/gl_mangle.h b/nx-X11/extras/Mesa/include/GL/gl_mangle.h
deleted file mode 100644
index c1b443c6b..000000000
--- a/nx-X11/extras/Mesa/include/GL/gl_mangle.h
+++ /dev/null
@@ -1,1472 +0,0 @@
-#if 0
-#define GL_MANGLE_C1 "DO NOT EDIT!!! - TO REGENERATE from gl.h, EXECUTE THIS FILE IN SHELL (/bin/sh) and save the output"
-#define GL_MANGLE_C2 "This file is used to create GL function protypes and aliases for the function names"
-	files="gl.h glext.h"
-#define GL_MANGLE_C3 "get regeneration header - copy everything in this file above the 'REGENERATE_TO_END' line"
-	awk 	'!done; /^\/\*REGENERATE_TO_END/ {done=1}' $0
-	echo ""
-#define GL_MANGLE_C4 get aliases
-	grep '^GLAPI' $files | sed -e 's/.*ENTRY gl\([^( ]*\).*$/#define gl\1		MANGLE(\1)/' | sort | uniq
-	echo ""
-	echo "#endif /* GL_MANGLE_H */"
-	exit
-#endif /* REGENERATION */
-
-/*
- * If you compile Mesa with USE_MGL_NAMESPACE defined then you can link
- * your application both with OpenGL and Mesa.  The Mesa functions will
- * be redefined so they are prefixed with "mgl" instead of "gl".
- * Mgl contributed by Randy Frank (rfrank@rsinc.com)
- * Regneration code contributed by Ray Tice (rayt@ma.ultra.net)
- */
-
-#ifndef GL_MANGLE_H
-#define GL_MANGLE_H
-
-#ifndef   MANGLE
-#define   MANGLE(x) mgl##x
-#endif  /*MANGLE*/
-
-/* Internal symbols which may collide with other OpenGL implementations. */
-#define __glCoreCreateContext __mglCoreCreateContext
-#define __glCoreNopDispatch   __mglCoreNopDispatch
-
-/*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */
-
-#define glAccum		MANGLE(Accum)
-#define glActiveStencilFaceEXT		MANGLE(ActiveStencilFaceEXT)
-#define glActiveTextureARB		MANGLE(ActiveTextureARB)
-#define glActiveTexture		MANGLE(ActiveTexture)
-#define glAlphaFragmentOp1ATI		MANGLE(AlphaFragmentOp1ATI)
-#define glAlphaFragmentOp2ATI		MANGLE(AlphaFragmentOp2ATI)
-#define glAlphaFragmentOp3ATI		MANGLE(AlphaFragmentOp3ATI)
-#define glAlphaFunc		MANGLE(AlphaFunc)
-#define glApplyTextureEXT		MANGLE(ApplyTextureEXT)
-#define glAreProgramsResidentNV		MANGLE(AreProgramsResidentNV)
-#define glAreTexturesResidentEXT		MANGLE(AreTexturesResidentEXT)
-#define glAreTexturesResident		MANGLE(AreTexturesResident)
-#define glArrayElementEXT		MANGLE(ArrayElementEXT)
-#define glArrayElement		MANGLE(ArrayElement)
-#define glArrayObjectATI		MANGLE(ArrayObjectATI)
-#define glAsyncMarkerSGIX		MANGLE(AsyncMarkerSGIX)
-#define glAttachObjectARB		MANGLE(AttachObjectARB)
-#define glAttachShader		MANGLE(AttachShader)
-#define glBeginFragmentShaderATI		MANGLE(BeginFragmentShaderATI)
-#define glBegin		MANGLE(Begin)
-#define glBeginOcclusionQueryNV		MANGLE(BeginOcclusionQueryNV)
-#define glBeginQueryARB		MANGLE(BeginQueryARB)
-#define glBeginQuery		MANGLE(BeginQuery)
-#define glBeginVertexShaderEXT		MANGLE(BeginVertexShaderEXT)
-#define glBindAttribLocationARB		MANGLE(BindAttribLocationARB)
-#define glBindAttribLocation		MANGLE(BindAttribLocation)
-#define glBindBufferARB		MANGLE(BindBufferARB)
-#define glBindBuffer		MANGLE(BindBuffer)
-#define glBindFragmentShaderATI		MANGLE(BindFragmentShaderATI)
-#define glBindFramebufferEXT		MANGLE(BindFramebufferEXT)
-#define glBindLightParameterEXT		MANGLE(BindLightParameterEXT)
-#define glBindMaterialParameterEXT		MANGLE(BindMaterialParameterEXT)
-#define glBindParameterEXT		MANGLE(BindParameterEXT)
-#define glBindProgramARB		MANGLE(BindProgramARB)
-#define glBindProgramNV		MANGLE(BindProgramNV)
-#define glBindRenderbufferEXT		MANGLE(BindRenderbufferEXT)
-#define glBindTexGenParameterEXT		MANGLE(BindTexGenParameterEXT)
-#define glBindTextureEXT		MANGLE(BindTextureEXT)
-#define glBindTexture		MANGLE(BindTexture)
-#define glBindTextureUnitParameterEXT		MANGLE(BindTextureUnitParameterEXT)
-#define glBindVertexArrayAPPLE		MANGLE(BindVertexArrayAPPLE)
-#define glBindVertexShaderEXT		MANGLE(BindVertexShaderEXT)
-#define glBinormal3bEXT		MANGLE(Binormal3bEXT)
-#define glBinormal3bvEXT		MANGLE(Binormal3bvEXT)
-#define glBinormal3dEXT		MANGLE(Binormal3dEXT)
-#define glBinormal3dvEXT		MANGLE(Binormal3dvEXT)
-#define glBinormal3fEXT		MANGLE(Binormal3fEXT)
-#define glBinormal3fvEXT		MANGLE(Binormal3fvEXT)
-#define glBinormal3iEXT		MANGLE(Binormal3iEXT)
-#define glBinormal3ivEXT		MANGLE(Binormal3ivEXT)
-#define glBinormal3sEXT		MANGLE(Binormal3sEXT)
-#define glBinormal3svEXT		MANGLE(Binormal3svEXT)
-#define glBinormalPointerEXT		MANGLE(BinormalPointerEXT)
-#define glBitmap		MANGLE(Bitmap)
-#define glBlendColorEXT		MANGLE(BlendColorEXT)
-#define glBlendColor		MANGLE(BlendColor)
-#define glBlendEquationEXT		MANGLE(BlendEquationEXT)
-#define glBlendEquation		MANGLE(BlendEquation)
-#define glBlendEquationSeparateATI		MANGLE(BlendEquationSeparateATI)
-#define glBlendEquationSeparateEXT		MANGLE(BlendEquationSeparateEXT)
-#define glBlendEquationSeparate		MANGLE(BlendEquationSeparate)
-#define glBlendFunc		MANGLE(BlendFunc)
-#define glBlendFuncSeparateEXT		MANGLE(BlendFuncSeparateEXT)
-#define glBlendFuncSeparateINGR		MANGLE(BlendFuncSeparateINGR)
-#define glBlendFuncSeparate		MANGLE(BlendFuncSeparate)
-#define glBufferDataARB		MANGLE(BufferDataARB)
-#define glBufferData		MANGLE(BufferData)
-#define glBufferSubDataARB		MANGLE(BufferSubDataARB)
-#define glBufferSubData		MANGLE(BufferSubData)
-#define glCallList		MANGLE(CallList)
-#define glCallLists		MANGLE(CallLists)
-#define glCheckFramebufferStatusEXT		MANGLE(CheckFramebufferStatusEXT)
-#define glClampColorARB		MANGLE(ClampColorARB)
-#define glClearAccum		MANGLE(ClearAccum)
-#define glClearColor		MANGLE(ClearColor)
-#define glClearDepth		MANGLE(ClearDepth)
-#define glClearIndex		MANGLE(ClearIndex)
-#define glClear		MANGLE(Clear)
-#define glClearStencil		MANGLE(ClearStencil)
-#define glClientActiveTextureARB		MANGLE(ClientActiveTextureARB)
-#define glClientActiveTexture		MANGLE(ClientActiveTexture)
-#define glClientActiveVertexStreamATI		MANGLE(ClientActiveVertexStreamATI)
-#define glClipPlane		MANGLE(ClipPlane)
-#define glColor3b		MANGLE(Color3b)
-#define glColor3bv		MANGLE(Color3bv)
-#define glColor3d		MANGLE(Color3d)
-#define glColor3dv		MANGLE(Color3dv)
-#define glColor3f		MANGLE(Color3f)
-#define glColor3fVertex3fSUN		MANGLE(Color3fVertex3fSUN)
-#define glColor3fVertex3fvSUN		MANGLE(Color3fVertex3fvSUN)
-#define glColor3fv		MANGLE(Color3fv)
-#define glColor3hNV		MANGLE(Color3hNV)
-#define glColor3hvNV		MANGLE(Color3hvNV)
-#define glColor3i		MANGLE(Color3i)
-#define glColor3iv		MANGLE(Color3iv)
-#define glColor3s		MANGLE(Color3s)
-#define glColor3sv		MANGLE(Color3sv)
-#define glColor3ub		MANGLE(Color3ub)
-#define glColor3ubv		MANGLE(Color3ubv)
-#define glColor3ui		MANGLE(Color3ui)
-#define glColor3uiv		MANGLE(Color3uiv)
-#define glColor3us		MANGLE(Color3us)
-#define glColor3usv		MANGLE(Color3usv)
-#define glColor4b		MANGLE(Color4b)
-#define glColor4bv		MANGLE(Color4bv)
-#define glColor4d		MANGLE(Color4d)
-#define glColor4dv		MANGLE(Color4dv)
-#define glColor4f		MANGLE(Color4f)
-#define glColor4fNormal3fVertex3fSUN		MANGLE(Color4fNormal3fVertex3fSUN)
-#define glColor4fNormal3fVertex3fvSUN		MANGLE(Color4fNormal3fVertex3fvSUN)
-#define glColor4fv		MANGLE(Color4fv)
-#define glColor4hNV		MANGLE(Color4hNV)
-#define glColor4hvNV		MANGLE(Color4hvNV)
-#define glColor4i		MANGLE(Color4i)
-#define glColor4iv		MANGLE(Color4iv)
-#define glColor4s		MANGLE(Color4s)
-#define glColor4sv		MANGLE(Color4sv)
-#define glColor4ub		MANGLE(Color4ub)
-#define glColor4ubVertex2fSUN		MANGLE(Color4ubVertex2fSUN)
-#define glColor4ubVertex2fvSUN		MANGLE(Color4ubVertex2fvSUN)
-#define glColor4ubVertex3fSUN		MANGLE(Color4ubVertex3fSUN)
-#define glColor4ubVertex3fvSUN		MANGLE(Color4ubVertex3fvSUN)
-#define glColor4ubv		MANGLE(Color4ubv)
-#define glColor4ui		MANGLE(Color4ui)
-#define glColor4uiv		MANGLE(Color4uiv)
-#define glColor4us		MANGLE(Color4us)
-#define glColor4usv		MANGLE(Color4usv)
-#define glColorFragmentOp1ATI		MANGLE(ColorFragmentOp1ATI)
-#define glColorFragmentOp2ATI		MANGLE(ColorFragmentOp2ATI)
-#define glColorFragmentOp3ATI		MANGLE(ColorFragmentOp3ATI)
-#define glColorMask		MANGLE(ColorMask)
-#define glColorMaterial		MANGLE(ColorMaterial)
-#define glColorPointerEXT		MANGLE(ColorPointerEXT)
-#define glColorPointerListIBM		MANGLE(ColorPointerListIBM)
-#define glColorPointer		MANGLE(ColorPointer)
-#define glColorPointervINTEL		MANGLE(ColorPointervINTEL)
-#define glColorSubTableEXT		MANGLE(ColorSubTableEXT)
-#define glColorSubTable		MANGLE(ColorSubTable)
-#define glColorTableEXT		MANGLE(ColorTableEXT)
-#define glColorTable		MANGLE(ColorTable)
-#define glColorTableParameterfv		MANGLE(ColorTableParameterfv)
-#define glColorTableParameterfvSGI		MANGLE(ColorTableParameterfvSGI)
-#define glColorTableParameteriv		MANGLE(ColorTableParameteriv)
-#define glColorTableParameterivSGI		MANGLE(ColorTableParameterivSGI)
-#define glColorTableSGI		MANGLE(ColorTableSGI)
-#define glCombinerInputNV		MANGLE(CombinerInputNV)
-#define glCombinerOutputNV		MANGLE(CombinerOutputNV)
-#define glCombinerParameterfNV		MANGLE(CombinerParameterfNV)
-#define glCombinerParameterfvNV		MANGLE(CombinerParameterfvNV)
-#define glCombinerParameteriNV		MANGLE(CombinerParameteriNV)
-#define glCombinerParameterivNV		MANGLE(CombinerParameterivNV)
-#define glCombinerStageParameterfvNV		MANGLE(CombinerStageParameterfvNV)
-#define glCompileShaderARB		MANGLE(CompileShaderARB)
-#define glCompileShader		MANGLE(CompileShader)
-#define glCompressedTexImage1DARB		MANGLE(CompressedTexImage1DARB)
-#define glCompressedTexImage1D		MANGLE(CompressedTexImage1D)
-#define glCompressedTexImage2DARB		MANGLE(CompressedTexImage2DARB)
-#define glCompressedTexImage2D		MANGLE(CompressedTexImage2D)
-#define glCompressedTexImage3DARB		MANGLE(CompressedTexImage3DARB)
-#define glCompressedTexImage3D		MANGLE(CompressedTexImage3D)
-#define glCompressedTexSubImage1DARB		MANGLE(CompressedTexSubImage1DARB)
-#define glCompressedTexSubImage1D		MANGLE(CompressedTexSubImage1D)
-#define glCompressedTexSubImage2DARB		MANGLE(CompressedTexSubImage2DARB)
-#define glCompressedTexSubImage2D		MANGLE(CompressedTexSubImage2D)
-#define glCompressedTexSubImage3DARB		MANGLE(CompressedTexSubImage3DARB)
-#define glCompressedTexSubImage3D		MANGLE(CompressedTexSubImage3D)
-#define glConvolutionFilter1DEXT		MANGLE(ConvolutionFilter1DEXT)
-#define glConvolutionFilter1D		MANGLE(ConvolutionFilter1D)
-#define glConvolutionFilter2DEXT		MANGLE(ConvolutionFilter2DEXT)
-#define glConvolutionFilter2D		MANGLE(ConvolutionFilter2D)
-#define glConvolutionParameterfEXT		MANGLE(ConvolutionParameterfEXT)
-#define glConvolutionParameterf		MANGLE(ConvolutionParameterf)
-#define glConvolutionParameterfvEXT		MANGLE(ConvolutionParameterfvEXT)
-#define glConvolutionParameterfv		MANGLE(ConvolutionParameterfv)
-#define glConvolutionParameteriEXT		MANGLE(ConvolutionParameteriEXT)
-#define glConvolutionParameteri		MANGLE(ConvolutionParameteri)
-#define glConvolutionParameterivEXT		MANGLE(ConvolutionParameterivEXT)
-#define glConvolutionParameteriv		MANGLE(ConvolutionParameteriv)
-#define glCopyColorSubTableEXT		MANGLE(CopyColorSubTableEXT)
-#define glCopyColorSubTable		MANGLE(CopyColorSubTable)
-#define glCopyColorTable		MANGLE(CopyColorTable)
-#define glCopyColorTableSGI		MANGLE(CopyColorTableSGI)
-#define glCopyConvolutionFilter1DEXT		MANGLE(CopyConvolutionFilter1DEXT)
-#define glCopyConvolutionFilter1D		MANGLE(CopyConvolutionFilter1D)
-#define glCopyConvolutionFilter2DEXT		MANGLE(CopyConvolutionFilter2DEXT)
-#define glCopyConvolutionFilter2D		MANGLE(CopyConvolutionFilter2D)
-#define glCopyPixels		MANGLE(CopyPixels)
-#define glCopyTexImage1DEXT		MANGLE(CopyTexImage1DEXT)
-#define glCopyTexImage1D		MANGLE(CopyTexImage1D)
-#define glCopyTexImage2DEXT		MANGLE(CopyTexImage2DEXT)
-#define glCopyTexImage2D		MANGLE(CopyTexImage2D)
-#define glCopyTexSubImage1DEXT		MANGLE(CopyTexSubImage1DEXT)
-#define glCopyTexSubImage1D		MANGLE(CopyTexSubImage1D)
-#define glCopyTexSubImage2DEXT		MANGLE(CopyTexSubImage2DEXT)
-#define glCopyTexSubImage2D		MANGLE(CopyTexSubImage2D)
-#define glCopyTexSubImage3DEXT		MANGLE(CopyTexSubImage3DEXT)
-#define glCopyTexSubImage3D		MANGLE(CopyTexSubImage3D)
-#define glCreateProgram		MANGLE(CreateProgram)
-#define glCreateProgramObjectARB		MANGLE(CreateProgramObjectARB)
-#define glCreateShader		MANGLE(CreateShader)
-#define glCreateShaderObjectARB		MANGLE(CreateShaderObjectARB)
-#define glCullFace		MANGLE(CullFace)
-#define glCullParameterdvEXT		MANGLE(CullParameterdvEXT)
-#define glCullParameterfvEXT		MANGLE(CullParameterfvEXT)
-#define glCurrentPaletteMatrixARB		MANGLE(CurrentPaletteMatrixARB)
-#define glDeformationMap3dSGIX		MANGLE(DeformationMap3dSGIX)
-#define glDeformationMap3fSGIX		MANGLE(DeformationMap3fSGIX)
-#define glDeformSGIX		MANGLE(DeformSGIX)
-#define glDeleteAsyncMarkersSGIX		MANGLE(DeleteAsyncMarkersSGIX)
-#define glDeleteBuffersARB		MANGLE(DeleteBuffersARB)
-#define glDeleteBuffers		MANGLE(DeleteBuffers)
-#define glDeleteFencesAPPLE		MANGLE(DeleteFencesAPPLE)
-#define glDeleteFencesNV		MANGLE(DeleteFencesNV)
-#define glDeleteFragmentShaderATI		MANGLE(DeleteFragmentShaderATI)
-#define glDeleteFramebuffersEXT		MANGLE(DeleteFramebuffersEXT)
-#define glDeleteLists		MANGLE(DeleteLists)
-#define glDeleteObjectARB		MANGLE(DeleteObjectARB)
-#define glDeleteOcclusionQueriesNV		MANGLE(DeleteOcclusionQueriesNV)
-#define glDeleteProgram		MANGLE(DeleteProgram)
-#define glDeleteProgramsARB		MANGLE(DeleteProgramsARB)
-#define glDeleteProgramsNV		MANGLE(DeleteProgramsNV)
-#define glDeleteQueriesARB		MANGLE(DeleteQueriesARB)
-#define glDeleteQueries		MANGLE(DeleteQueries)
-#define glDeleteRenderbuffersEXT		MANGLE(DeleteRenderbuffersEXT)
-#define glDeleteShader		MANGLE(DeleteShader)
-#define glDeleteTexturesEXT		MANGLE(DeleteTexturesEXT)
-#define glDeleteTextures		MANGLE(DeleteTextures)
-#define glDeleteVertexArraysAPPLE		MANGLE(DeleteVertexArraysAPPLE)
-#define glDeleteVertexShaderEXT		MANGLE(DeleteVertexShaderEXT)
-#define glDepthBoundsEXT		MANGLE(DepthBoundsEXT)
-#define glDepthFunc		MANGLE(DepthFunc)
-#define glDepthMask		MANGLE(DepthMask)
-#define glDepthRange		MANGLE(DepthRange)
-#define glDetachObjectARB		MANGLE(DetachObjectARB)
-#define glDetachShader		MANGLE(DetachShader)
-#define glDetailTexFuncSGIS		MANGLE(DetailTexFuncSGIS)
-#define glDisableClientState		MANGLE(DisableClientState)
-#define glDisable		MANGLE(Disable)
-#define glDisableTraceMESA		MANGLE(DisableTraceMESA)
-#define glDisableVariantClientStateEXT		MANGLE(DisableVariantClientStateEXT)
-#define glDisableVertexAttribArrayARB		MANGLE(DisableVertexAttribArrayARB)
-#define glDisableVertexAttribArray		MANGLE(DisableVertexAttribArray)
-#define glDrawArraysEXT		MANGLE(DrawArraysEXT)
-#define glDrawArrays		MANGLE(DrawArrays)
-#define glDrawBuffer		MANGLE(DrawBuffer)
-#define glDrawBuffersARB		MANGLE(DrawBuffersARB)
-#define glDrawBuffersATI		MANGLE(DrawBuffersATI)
-#define glDrawBuffers		MANGLE(DrawBuffers)
-#define glDrawElementArrayAPPLE		MANGLE(DrawElementArrayAPPLE)
-#define glDrawElementArrayATI		MANGLE(DrawElementArrayATI)
-#define glDrawElements		MANGLE(DrawElements)
-#define glDrawMeshArraysSUN		MANGLE(DrawMeshArraysSUN)
-#define glDrawPixels		MANGLE(DrawPixels)
-#define glDrawRangeElementArrayAPPLE		MANGLE(DrawRangeElementArrayAPPLE)
-#define glDrawRangeElementArrayATI		MANGLE(DrawRangeElementArrayATI)
-#define glDrawRangeElementsEXT		MANGLE(DrawRangeElementsEXT)
-#define glDrawRangeElements		MANGLE(DrawRangeElements)
-#define glEdgeFlag		MANGLE(EdgeFlag)
-#define glEdgeFlagPointerEXT		MANGLE(EdgeFlagPointerEXT)
-#define glEdgeFlagPointerListIBM		MANGLE(EdgeFlagPointerListIBM)
-#define glEdgeFlagPointer		MANGLE(EdgeFlagPointer)
-#define glEdgeFlagv		MANGLE(EdgeFlagv)
-#define glElementPointerAPPLE		MANGLE(ElementPointerAPPLE)
-#define glElementPointerATI		MANGLE(ElementPointerATI)
-#define glEnableClientState		MANGLE(EnableClientState)
-#define glEnable		MANGLE(Enable)
-#define glEnableTraceMESA		MANGLE(EnableTraceMESA)
-#define glEnableVariantClientStateEXT		MANGLE(EnableVariantClientStateEXT)
-#define glEnableVertexAttribArrayARB		MANGLE(EnableVertexAttribArrayARB)
-#define glEnableVertexAttribArray		MANGLE(EnableVertexAttribArray)
-#define glEndFragmentShaderATI		MANGLE(EndFragmentShaderATI)
-#define glEndList		MANGLE(EndList)
-#define glEnd		MANGLE(End)
-#define glEndOcclusionQueryNV		MANGLE(EndOcclusionQueryNV)
-#define glEndQueryARB		MANGLE(EndQueryARB)
-#define glEndQuery		MANGLE(EndQuery)
-#define glEndTraceMESA		MANGLE(EndTraceMESA)
-#define glEndVertexShaderEXT		MANGLE(EndVertexShaderEXT)
-#define glEvalCoord1d		MANGLE(EvalCoord1d)
-#define glEvalCoord1dv		MANGLE(EvalCoord1dv)
-#define glEvalCoord1f		MANGLE(EvalCoord1f)
-#define glEvalCoord1fv		MANGLE(EvalCoord1fv)
-#define glEvalCoord2d		MANGLE(EvalCoord2d)
-#define glEvalCoord2dv		MANGLE(EvalCoord2dv)
-#define glEvalCoord2f		MANGLE(EvalCoord2f)
-#define glEvalCoord2fv		MANGLE(EvalCoord2fv)
-#define glEvalMapsNV		MANGLE(EvalMapsNV)
-#define glEvalMesh1		MANGLE(EvalMesh1)
-#define glEvalMesh2		MANGLE(EvalMesh2)
-#define glEvalPoint1		MANGLE(EvalPoint1)
-#define glEvalPoint2		MANGLE(EvalPoint2)
-#define glExecuteProgramNV		MANGLE(ExecuteProgramNV)
-#define glExtractComponentEXT		MANGLE(ExtractComponentEXT)
-#define glFeedbackBuffer		MANGLE(FeedbackBuffer)
-#define glFinalCombinerInputNV		MANGLE(FinalCombinerInputNV)
-#define glFinishAsyncSGIX		MANGLE(FinishAsyncSGIX)
-#define glFinishFenceAPPLE		MANGLE(FinishFenceAPPLE)
-#define glFinishFenceNV		MANGLE(FinishFenceNV)
-#define glFinish		MANGLE(Finish)
-#define glFinishObjectAPPLE		MANGLE(FinishObjectAPPLE)
-#define glFinishTextureSUNX		MANGLE(FinishTextureSUNX)
-#define glFlush		MANGLE(Flush)
-#define glFlushPixelDataRangeNV		MANGLE(FlushPixelDataRangeNV)
-#define glFlushRasterSGIX		MANGLE(FlushRasterSGIX)
-#define glFlushVertexArrayRangeAPPLE		MANGLE(FlushVertexArrayRangeAPPLE)
-#define glFlushVertexArrayRangeNV		MANGLE(FlushVertexArrayRangeNV)
-#define glFogCoorddEXT		MANGLE(FogCoorddEXT)
-#define glFogCoordd		MANGLE(FogCoordd)
-#define glFogCoorddvEXT		MANGLE(FogCoorddvEXT)
-#define glFogCoorddv		MANGLE(FogCoorddv)
-#define glFogCoordfEXT		MANGLE(FogCoordfEXT)
-#define glFogCoordf		MANGLE(FogCoordf)
-#define glFogCoordfvEXT		MANGLE(FogCoordfvEXT)
-#define glFogCoordfv		MANGLE(FogCoordfv)
-#define glFogCoordhNV		MANGLE(FogCoordhNV)
-#define glFogCoordhvNV		MANGLE(FogCoordhvNV)
-#define glFogCoordPointerEXT		MANGLE(FogCoordPointerEXT)
-#define glFogCoordPointerListIBM		MANGLE(FogCoordPointerListIBM)
-#define glFogCoordPointer		MANGLE(FogCoordPointer)
-#define glFogf		MANGLE(Fogf)
-#define glFogFuncSGIS		MANGLE(FogFuncSGIS)
-#define glFogfv		MANGLE(Fogfv)
-#define glFogi		MANGLE(Fogi)
-#define glFogiv		MANGLE(Fogiv)
-#define glFragmentColorMaterialSGIX		MANGLE(FragmentColorMaterialSGIX)
-#define glFragmentLightfSGIX		MANGLE(FragmentLightfSGIX)
-#define glFragmentLightfvSGIX		MANGLE(FragmentLightfvSGIX)
-#define glFragmentLightiSGIX		MANGLE(FragmentLightiSGIX)
-#define glFragmentLightivSGIX		MANGLE(FragmentLightivSGIX)
-#define glFragmentLightModelfSGIX		MANGLE(FragmentLightModelfSGIX)
-#define glFragmentLightModelfvSGIX		MANGLE(FragmentLightModelfvSGIX)
-#define glFragmentLightModeliSGIX		MANGLE(FragmentLightModeliSGIX)
-#define glFragmentLightModelivSGIX		MANGLE(FragmentLightModelivSGIX)
-#define glFragmentMaterialfSGIX		MANGLE(FragmentMaterialfSGIX)
-#define glFragmentMaterialfvSGIX		MANGLE(FragmentMaterialfvSGIX)
-#define glFragmentMaterialiSGIX		MANGLE(FragmentMaterialiSGIX)
-#define glFragmentMaterialivSGIX		MANGLE(FragmentMaterialivSGIX)
-#define glFramebufferRenderbufferEXT		MANGLE(FramebufferRenderbufferEXT)
-#define glFramebufferTexture1DEXT		MANGLE(FramebufferTexture1DEXT)
-#define glFramebufferTexture2DEXT		MANGLE(FramebufferTexture2DEXT)
-#define glFramebufferTexture3DEXT		MANGLE(FramebufferTexture3DEXT)
-#define glFrameZoomSGIX		MANGLE(FrameZoomSGIX)
-#define glFreeObjectBufferATI		MANGLE(FreeObjectBufferATI)
-#define glFrontFace		MANGLE(FrontFace)
-#define glFrustum		MANGLE(Frustum)
-#define glGenAsyncMarkersSGIX		MANGLE(GenAsyncMarkersSGIX)
-#define glGenBuffersARB		MANGLE(GenBuffersARB)
-#define glGenBuffers		MANGLE(GenBuffers)
-#define glGenerateMipmapEXT		MANGLE(GenerateMipmapEXT)
-#define glGenFencesAPPLE		MANGLE(GenFencesAPPLE)
-#define glGenFencesNV		MANGLE(GenFencesNV)
-#define glGenFragmentShadersATI		MANGLE(GenFragmentShadersATI)
-#define glGenFramebuffersEXT		MANGLE(GenFramebuffersEXT)
-#define glGenLists		MANGLE(GenLists)
-#define glGenOcclusionQueriesNV		MANGLE(GenOcclusionQueriesNV)
-#define glGenProgramsARB		MANGLE(GenProgramsARB)
-#define glGenProgramsNV		MANGLE(GenProgramsNV)
-#define glGenQueriesARB		MANGLE(GenQueriesARB)
-#define glGenQueries		MANGLE(GenQueries)
-#define glGenRenderbuffersEXT		MANGLE(GenRenderbuffersEXT)
-#define glGenSymbolsEXT		MANGLE(GenSymbolsEXT)
-#define glGenTexturesEXT		MANGLE(GenTexturesEXT)
-#define glGenTextures		MANGLE(GenTextures)
-#define glGenVertexArraysAPPLE		MANGLE(GenVertexArraysAPPLE)
-#define glGenVertexShadersEXT		MANGLE(GenVertexShadersEXT)
-#define glGetActiveAttribARB		MANGLE(GetActiveAttribARB)
-#define glGetActiveAttrib		MANGLE(GetActiveAttrib)
-#define glGetActiveUniformARB		MANGLE(GetActiveUniformARB)
-#define glGetActiveUniform		MANGLE(GetActiveUniform)
-#define glGetArrayObjectfvATI		MANGLE(GetArrayObjectfvATI)
-#define glGetArrayObjectivATI		MANGLE(GetArrayObjectivATI)
-#define glGetAttachedObjectsARB		MANGLE(GetAttachedObjectsARB)
-#define glGetAttachedShaders		MANGLE(GetAttachedShaders)
-#define glGetAttribLocationARB		MANGLE(GetAttribLocationARB)
-#define glGetAttribLocation		MANGLE(GetAttribLocation)
-#define glGetBooleanv		MANGLE(GetBooleanv)
-#define glGetBufferParameterivARB		MANGLE(GetBufferParameterivARB)
-#define glGetBufferParameteriv		MANGLE(GetBufferParameteriv)
-#define glGetBufferPointervARB		MANGLE(GetBufferPointervARB)
-#define glGetBufferPointerv		MANGLE(GetBufferPointerv)
-#define glGetBufferSubDataARB		MANGLE(GetBufferSubDataARB)
-#define glGetBufferSubData		MANGLE(GetBufferSubData)
-#define glGetClipPlane		MANGLE(GetClipPlane)
-#define glGetColorTableEXT		MANGLE(GetColorTableEXT)
-#define glGetColorTable		MANGLE(GetColorTable)
-#define glGetColorTableParameterfvEXT		MANGLE(GetColorTableParameterfvEXT)
-#define glGetColorTableParameterfv		MANGLE(GetColorTableParameterfv)
-#define glGetColorTableParameterfvSGI		MANGLE(GetColorTableParameterfvSGI)
-#define glGetColorTableParameterivEXT		MANGLE(GetColorTableParameterivEXT)
-#define glGetColorTableParameteriv		MANGLE(GetColorTableParameteriv)
-#define glGetColorTableParameterivSGI		MANGLE(GetColorTableParameterivSGI)
-#define glGetColorTableSGI		MANGLE(GetColorTableSGI)
-#define glGetCombinerInputParameterfvNV		MANGLE(GetCombinerInputParameterfvNV)
-#define glGetCombinerInputParameterivNV		MANGLE(GetCombinerInputParameterivNV)
-#define glGetCombinerOutputParameterfvNV		MANGLE(GetCombinerOutputParameterfvNV)
-#define glGetCombinerOutputParameterivNV		MANGLE(GetCombinerOutputParameterivNV)
-#define glGetCombinerStageParameterfvNV		MANGLE(GetCombinerStageParameterfvNV)
-#define glGetCompressedTexImageARB		MANGLE(GetCompressedTexImageARB)
-#define glGetCompressedTexImage		MANGLE(GetCompressedTexImage)
-#define glGetConvolutionFilterEXT		MANGLE(GetConvolutionFilterEXT)
-#define glGetConvolutionFilter		MANGLE(GetConvolutionFilter)
-#define glGetConvolutionParameterfvEXT		MANGLE(GetConvolutionParameterfvEXT)
-#define glGetConvolutionParameterfv		MANGLE(GetConvolutionParameterfv)
-#define glGetConvolutionParameterivEXT		MANGLE(GetConvolutionParameterivEXT)
-#define glGetConvolutionParameteriv		MANGLE(GetConvolutionParameteriv)
-#define glGetDetailTexFuncSGIS		MANGLE(GetDetailTexFuncSGIS)
-#define glGetDoublev		MANGLE(GetDoublev)
-#define glGetError		MANGLE(GetError)
-#define glGetFenceivNV		MANGLE(GetFenceivNV)
-#define glGetFinalCombinerInputParameterfvNV		MANGLE(GetFinalCombinerInputParameterfvNV)
-#define glGetFinalCombinerInputParameterivNV		MANGLE(GetFinalCombinerInputParameterivNV)
-#define glGetFloatv		MANGLE(GetFloatv)
-#define glGetFogFuncSGIS		MANGLE(GetFogFuncSGIS)
-#define glGetFragmentLightfvSGIX		MANGLE(GetFragmentLightfvSGIX)
-#define glGetFragmentLightivSGIX		MANGLE(GetFragmentLightivSGIX)
-#define glGetFragmentMaterialfvSGIX		MANGLE(GetFragmentMaterialfvSGIX)
-#define glGetFragmentMaterialivSGIX		MANGLE(GetFragmentMaterialivSGIX)
-#define glGetFramebufferAttachmentParameterivEXT		MANGLE(GetFramebufferAttachmentParameterivEXT)
-#define glGetHandleARB		MANGLE(GetHandleARB)
-#define glGetHistogramEXT		MANGLE(GetHistogramEXT)
-#define glGetHistogram		MANGLE(GetHistogram)
-#define glGetHistogramParameterfvEXT		MANGLE(GetHistogramParameterfvEXT)
-#define glGetHistogramParameterfv		MANGLE(GetHistogramParameterfv)
-#define glGetHistogramParameterivEXT		MANGLE(GetHistogramParameterivEXT)
-#define glGetHistogramParameteriv		MANGLE(GetHistogramParameteriv)
-#define glGetImageTransformParameterfvHP		MANGLE(GetImageTransformParameterfvHP)
-#define glGetImageTransformParameterivHP		MANGLE(GetImageTransformParameterivHP)
-#define glGetInfoLogARB		MANGLE(GetInfoLogARB)
-#define glGetInstrumentsSGIX		MANGLE(GetInstrumentsSGIX)
-#define glGetIntegerv		MANGLE(GetIntegerv)
-#define glGetInvariantBooleanvEXT		MANGLE(GetInvariantBooleanvEXT)
-#define glGetInvariantFloatvEXT		MANGLE(GetInvariantFloatvEXT)
-#define glGetInvariantIntegervEXT		MANGLE(GetInvariantIntegervEXT)
-#define glGetLightfv		MANGLE(GetLightfv)
-#define glGetLightiv		MANGLE(GetLightiv)
-#define glGetListParameterfvSGIX		MANGLE(GetListParameterfvSGIX)
-#define glGetListParameterivSGIX		MANGLE(GetListParameterivSGIX)
-#define glGetLocalConstantBooleanvEXT		MANGLE(GetLocalConstantBooleanvEXT)
-#define glGetLocalConstantFloatvEXT		MANGLE(GetLocalConstantFloatvEXT)
-#define glGetLocalConstantIntegervEXT		MANGLE(GetLocalConstantIntegervEXT)
-#define glGetMapAttribParameterfvNV		MANGLE(GetMapAttribParameterfvNV)
-#define glGetMapAttribParameterivNV		MANGLE(GetMapAttribParameterivNV)
-#define glGetMapControlPointsNV		MANGLE(GetMapControlPointsNV)
-#define glGetMapdv		MANGLE(GetMapdv)
-#define glGetMapfv		MANGLE(GetMapfv)
-#define glGetMapiv		MANGLE(GetMapiv)
-#define glGetMapParameterfvNV		MANGLE(GetMapParameterfvNV)
-#define glGetMapParameterivNV		MANGLE(GetMapParameterivNV)
-#define glGetMaterialfv		MANGLE(GetMaterialfv)
-#define glGetMaterialiv		MANGLE(GetMaterialiv)
-#define glGetMinmaxEXT		MANGLE(GetMinmaxEXT)
-#define glGetMinmax		MANGLE(GetMinmax)
-#define glGetMinmaxParameterfvEXT		MANGLE(GetMinmaxParameterfvEXT)
-#define glGetMinmaxParameterfv		MANGLE(GetMinmaxParameterfv)
-#define glGetMinmaxParameterivEXT		MANGLE(GetMinmaxParameterivEXT)
-#define glGetMinmaxParameteriv		MANGLE(GetMinmaxParameteriv)
-#define glGetObjectBufferfvATI		MANGLE(GetObjectBufferfvATI)
-#define glGetObjectBufferivATI		MANGLE(GetObjectBufferivATI)
-#define glGetObjectParameterfvARB		MANGLE(GetObjectParameterfvARB)
-#define glGetObjectParameterivARB		MANGLE(GetObjectParameterivARB)
-#define glGetOcclusionQueryivNV		MANGLE(GetOcclusionQueryivNV)
-#define glGetOcclusionQueryuivNV		MANGLE(GetOcclusionQueryuivNV)
-#define glGetPixelMapfv		MANGLE(GetPixelMapfv)
-#define glGetPixelMapuiv		MANGLE(GetPixelMapuiv)
-#define glGetPixelMapusv		MANGLE(GetPixelMapusv)
-#define glGetPixelTexGenParameterfvSGIS		MANGLE(GetPixelTexGenParameterfvSGIS)
-#define glGetPixelTexGenParameterivSGIS		MANGLE(GetPixelTexGenParameterivSGIS)
-#define glGetPointervEXT		MANGLE(GetPointervEXT)
-#define glGetPointerv		MANGLE(GetPointerv)
-#define glGetPolygonStipple		MANGLE(GetPolygonStipple)
-#define glGetProgramEnvParameterdvARB		MANGLE(GetProgramEnvParameterdvARB)
-#define glGetProgramEnvParameterfvARB		MANGLE(GetProgramEnvParameterfvARB)
-#define glGetProgramInfoLog		MANGLE(GetProgramInfoLog)
-#define glGetProgramivARB		MANGLE(GetProgramivARB)
-#define glGetProgramiv		MANGLE(GetProgramiv)
-#define glGetProgramivNV		MANGLE(GetProgramivNV)
-#define glGetProgramLocalParameterdvARB		MANGLE(GetProgramLocalParameterdvARB)
-#define glGetProgramLocalParameterfvARB		MANGLE(GetProgramLocalParameterfvARB)
-#define glGetProgramNamedParameterdvNV		MANGLE(GetProgramNamedParameterdvNV)
-#define glGetProgramNamedParameterfvNV		MANGLE(GetProgramNamedParameterfvNV)
-#define glGetProgramParameterdvNV		MANGLE(GetProgramParameterdvNV)
-#define glGetProgramParameterfvNV		MANGLE(GetProgramParameterfvNV)
-#define glGetProgramRegisterfvMESA		MANGLE(GetProgramRegisterfvMESA)
-#define glGetProgramStringARB		MANGLE(GetProgramStringARB)
-#define glGetProgramStringNV		MANGLE(GetProgramStringNV)
-#define glGetQueryivARB		MANGLE(GetQueryivARB)
-#define glGetQueryiv		MANGLE(GetQueryiv)
-#define glGetQueryObjectivARB		MANGLE(GetQueryObjectivARB)
-#define glGetQueryObjectiv		MANGLE(GetQueryObjectiv)
-#define glGetQueryObjectuivARB		MANGLE(GetQueryObjectuivARB)
-#define glGetQueryObjectuiv		MANGLE(GetQueryObjectuiv)
-#define glGetRenderbufferParameterivEXT		MANGLE(GetRenderbufferParameterivEXT)
-#define glGetSeparableFilterEXT		MANGLE(GetSeparableFilterEXT)
-#define glGetSeparableFilter		MANGLE(GetSeparableFilter)
-#define glGetShaderInfoLog		MANGLE(GetShaderInfoLog)
-#define glGetShaderiv		MANGLE(GetShaderiv)
-#define glGetShaderSourceARB		MANGLE(GetShaderSourceARB)
-#define glGetShaderSource		MANGLE(GetShaderSource)
-#define glGetSharpenTexFuncSGIS		MANGLE(GetSharpenTexFuncSGIS)
-#define glGetString		MANGLE(GetString)
-#define glGetTexBumpParameterfvATI		MANGLE(GetTexBumpParameterfvATI)
-#define glGetTexBumpParameterivATI		MANGLE(GetTexBumpParameterivATI)
-#define glGetTexEnvfv		MANGLE(GetTexEnvfv)
-#define glGetTexEnviv		MANGLE(GetTexEnviv)
-#define glGetTexFilterFuncSGIS		MANGLE(GetTexFilterFuncSGIS)
-#define glGetTexGendv		MANGLE(GetTexGendv)
-#define glGetTexGenfv		MANGLE(GetTexGenfv)
-#define glGetTexGeniv		MANGLE(GetTexGeniv)
-#define glGetTexImage		MANGLE(GetTexImage)
-#define glGetTexLevelParameterfv		MANGLE(GetTexLevelParameterfv)
-#define glGetTexLevelParameteriv		MANGLE(GetTexLevelParameteriv)
-#define glGetTexParameterfv		MANGLE(GetTexParameterfv)
-#define glGetTexParameteriv		MANGLE(GetTexParameteriv)
-#define glGetTrackMatrixivNV		MANGLE(GetTrackMatrixivNV)
-#define glGetUniformfvARB		MANGLE(GetUniformfvARB)
-#define glGetUniformfv		MANGLE(GetUniformfv)
-#define glGetUniformivARB		MANGLE(GetUniformivARB)
-#define glGetUniformiv		MANGLE(GetUniformiv)
-#define glGetUniformLocationARB		MANGLE(GetUniformLocationARB)
-#define glGetUniformLocation		MANGLE(GetUniformLocation)
-#define glGetVariantArrayObjectfvATI		MANGLE(GetVariantArrayObjectfvATI)
-#define glGetVariantArrayObjectivATI		MANGLE(GetVariantArrayObjectivATI)
-#define glGetVariantBooleanvEXT		MANGLE(GetVariantBooleanvEXT)
-#define glGetVariantFloatvEXT		MANGLE(GetVariantFloatvEXT)
-#define glGetVariantIntegervEXT		MANGLE(GetVariantIntegervEXT)
-#define glGetVariantPointervEXT		MANGLE(GetVariantPointervEXT)
-#define glGetVertexAttribArrayObjectfvATI		MANGLE(GetVertexAttribArrayObjectfvATI)
-#define glGetVertexAttribArrayObjectivATI		MANGLE(GetVertexAttribArrayObjectivATI)
-#define glGetVertexAttribdvARB		MANGLE(GetVertexAttribdvARB)
-#define glGetVertexAttribdv		MANGLE(GetVertexAttribdv)
-#define glGetVertexAttribdvNV		MANGLE(GetVertexAttribdvNV)
-#define glGetVertexAttribfvARB		MANGLE(GetVertexAttribfvARB)
-#define glGetVertexAttribfv		MANGLE(GetVertexAttribfv)
-#define glGetVertexAttribfvNV		MANGLE(GetVertexAttribfvNV)
-#define glGetVertexAttribivARB		MANGLE(GetVertexAttribivARB)
-#define glGetVertexAttribiv		MANGLE(GetVertexAttribiv)
-#define glGetVertexAttribivNV		MANGLE(GetVertexAttribivNV)
-#define glGetVertexAttribPointervARB		MANGLE(GetVertexAttribPointervARB)
-#define glGetVertexAttribPointerv		MANGLE(GetVertexAttribPointerv)
-#define glGetVertexAttribPointervNV		MANGLE(GetVertexAttribPointervNV)
-#define glGlobalAlphaFactorbSUN		MANGLE(GlobalAlphaFactorbSUN)
-#define glGlobalAlphaFactordSUN		MANGLE(GlobalAlphaFactordSUN)
-#define glGlobalAlphaFactorfSUN		MANGLE(GlobalAlphaFactorfSUN)
-#define glGlobalAlphaFactoriSUN		MANGLE(GlobalAlphaFactoriSUN)
-#define glGlobalAlphaFactorsSUN		MANGLE(GlobalAlphaFactorsSUN)
-#define glGlobalAlphaFactorubSUN		MANGLE(GlobalAlphaFactorubSUN)
-#define glGlobalAlphaFactoruiSUN		MANGLE(GlobalAlphaFactoruiSUN)
-#define glGlobalAlphaFactorusSUN		MANGLE(GlobalAlphaFactorusSUN)
-#define glHint		MANGLE(Hint)
-#define glHintPGI		MANGLE(HintPGI)
-#define glHistogramEXT		MANGLE(HistogramEXT)
-#define glHistogram		MANGLE(Histogram)
-#define glIglooInterfaceSGIX		MANGLE(IglooInterfaceSGIX)
-#define glImageTransformParameterfHP		MANGLE(ImageTransformParameterfHP)
-#define glImageTransformParameterfvHP		MANGLE(ImageTransformParameterfvHP)
-#define glImageTransformParameteriHP		MANGLE(ImageTransformParameteriHP)
-#define glImageTransformParameterivHP		MANGLE(ImageTransformParameterivHP)
-#define glIndexd		MANGLE(Indexd)
-#define glIndexdv		MANGLE(Indexdv)
-#define glIndexf		MANGLE(Indexf)
-#define glIndexFuncEXT		MANGLE(IndexFuncEXT)
-#define glIndexfv		MANGLE(Indexfv)
-#define glIndexi		MANGLE(Indexi)
-#define glIndexiv		MANGLE(Indexiv)
-#define glIndexMask		MANGLE(IndexMask)
-#define glIndexMaterialEXT		MANGLE(IndexMaterialEXT)
-#define glIndexPointerEXT		MANGLE(IndexPointerEXT)
-#define glIndexPointerListIBM		MANGLE(IndexPointerListIBM)
-#define glIndexPointer		MANGLE(IndexPointer)
-#define glIndexs		MANGLE(Indexs)
-#define glIndexsv		MANGLE(Indexsv)
-#define glIndexub		MANGLE(Indexub)
-#define glIndexubv		MANGLE(Indexubv)
-#define glInitNames		MANGLE(InitNames)
-#define glInsertComponentEXT		MANGLE(InsertComponentEXT)
-#define glInstrumentsBufferSGIX		MANGLE(InstrumentsBufferSGIX)
-#define glInterleavedArrays		MANGLE(InterleavedArrays)
-#define glIsAsyncMarkerSGIX		MANGLE(IsAsyncMarkerSGIX)
-#define glIsBufferARB		MANGLE(IsBufferARB)
-#define glIsBuffer		MANGLE(IsBuffer)
-#define glIsEnabled		MANGLE(IsEnabled)
-#define glIsFenceAPPLE		MANGLE(IsFenceAPPLE)
-#define glIsFenceNV		MANGLE(IsFenceNV)
-#define glIsFramebufferEXT		MANGLE(IsFramebufferEXT)
-#define glIsList		MANGLE(IsList)
-#define glIsObjectBufferATI		MANGLE(IsObjectBufferATI)
-#define glIsOcclusionQueryNV		MANGLE(IsOcclusionQueryNV)
-#define glIsProgramARB		MANGLE(IsProgramARB)
-#define glIsProgram		MANGLE(IsProgram)
-#define glIsProgramNV		MANGLE(IsProgramNV)
-#define glIsQueryARB		MANGLE(IsQueryARB)
-#define glIsQuery		MANGLE(IsQuery)
-#define glIsRenderbufferEXT		MANGLE(IsRenderbufferEXT)
-#define glIsShader		MANGLE(IsShader)
-#define glIsTextureEXT		MANGLE(IsTextureEXT)
-#define glIsTexture		MANGLE(IsTexture)
-#define glIsVariantEnabledEXT		MANGLE(IsVariantEnabledEXT)
-#define glIsVertexArrayAPPLE		MANGLE(IsVertexArrayAPPLE)
-#define glLightEnviSGIX		MANGLE(LightEnviSGIX)
-#define glLightf		MANGLE(Lightf)
-#define glLightfv		MANGLE(Lightfv)
-#define glLighti		MANGLE(Lighti)
-#define glLightiv		MANGLE(Lightiv)
-#define glLightModelf		MANGLE(LightModelf)
-#define glLightModelfv		MANGLE(LightModelfv)
-#define glLightModeli		MANGLE(LightModeli)
-#define glLightModeliv		MANGLE(LightModeliv)
-#define glLineStipple		MANGLE(LineStipple)
-#define glLineWidth		MANGLE(LineWidth)
-#define glLinkProgramARB		MANGLE(LinkProgramARB)
-#define glLinkProgram		MANGLE(LinkProgram)
-#define glListBase		MANGLE(ListBase)
-#define glListParameterfSGIX		MANGLE(ListParameterfSGIX)
-#define glListParameterfvSGIX		MANGLE(ListParameterfvSGIX)
-#define glListParameteriSGIX		MANGLE(ListParameteriSGIX)
-#define glListParameterivSGIX		MANGLE(ListParameterivSGIX)
-#define glLoadIdentityDeformationMapSGIX		MANGLE(LoadIdentityDeformationMapSGIX)
-#define glLoadIdentity		MANGLE(LoadIdentity)
-#define glLoadMatrixd		MANGLE(LoadMatrixd)
-#define glLoadMatrixf		MANGLE(LoadMatrixf)
-#define glLoadName		MANGLE(LoadName)
-#define glLoadProgramNV		MANGLE(LoadProgramNV)
-#define glLoadTransposeMatrixdARB		MANGLE(LoadTransposeMatrixdARB)
-#define glLoadTransposeMatrixd		MANGLE(LoadTransposeMatrixd)
-#define glLoadTransposeMatrixfARB		MANGLE(LoadTransposeMatrixfARB)
-#define glLoadTransposeMatrixf		MANGLE(LoadTransposeMatrixf)
-#define glLockArraysEXT		MANGLE(LockArraysEXT)
-#define glLogicOp		MANGLE(LogicOp)
-#define glMap1d		MANGLE(Map1d)
-#define glMap1f		MANGLE(Map1f)
-#define glMap2d		MANGLE(Map2d)
-#define glMap2f		MANGLE(Map2f)
-#define glMapBufferARB		MANGLE(MapBufferARB)
-#define glMapBuffer		MANGLE(MapBuffer)
-#define glMapControlPointsNV		MANGLE(MapControlPointsNV)
-#define glMapGrid1d		MANGLE(MapGrid1d)
-#define glMapGrid1f		MANGLE(MapGrid1f)
-#define glMapGrid2d		MANGLE(MapGrid2d)
-#define glMapGrid2f		MANGLE(MapGrid2f)
-#define glMapObjectBufferATI		MANGLE(MapObjectBufferATI)
-#define glMapParameterfvNV		MANGLE(MapParameterfvNV)
-#define glMapParameterivNV		MANGLE(MapParameterivNV)
-#define glMaterialf		MANGLE(Materialf)
-#define glMaterialfv		MANGLE(Materialfv)
-#define glMateriali		MANGLE(Materiali)
-#define glMaterialiv		MANGLE(Materialiv)
-#define glMatrixIndexPointerARB		MANGLE(MatrixIndexPointerARB)
-#define glMatrixIndexubvARB		MANGLE(MatrixIndexubvARB)
-#define glMatrixIndexuivARB		MANGLE(MatrixIndexuivARB)
-#define glMatrixIndexusvARB		MANGLE(MatrixIndexusvARB)
-#define glMatrixMode		MANGLE(MatrixMode)
-#define glMinmaxEXT		MANGLE(MinmaxEXT)
-#define glMinmax		MANGLE(Minmax)
-#define glMultiDrawArraysEXT		MANGLE(MultiDrawArraysEXT)
-#define glMultiDrawArrays		MANGLE(MultiDrawArrays)
-#define glMultiDrawElementArrayAPPLE		MANGLE(MultiDrawElementArrayAPPLE)
-#define glMultiDrawElementsEXT		MANGLE(MultiDrawElementsEXT)
-#define glMultiDrawElements		MANGLE(MultiDrawElements)
-#define glMultiDrawRangeElementArrayAPPLE		MANGLE(MultiDrawRangeElementArrayAPPLE)
-#define glMultiModeDrawArraysIBM		MANGLE(MultiModeDrawArraysIBM)
-#define glMultiModeDrawElementsIBM		MANGLE(MultiModeDrawElementsIBM)
-#define glMultiTexCoord1dARB		MANGLE(MultiTexCoord1dARB)
-#define glMultiTexCoord1d		MANGLE(MultiTexCoord1d)
-#define glMultiTexCoord1dvARB		MANGLE(MultiTexCoord1dvARB)
-#define glMultiTexCoord1dv		MANGLE(MultiTexCoord1dv)
-#define glMultiTexCoord1fARB		MANGLE(MultiTexCoord1fARB)
-#define glMultiTexCoord1f		MANGLE(MultiTexCoord1f)
-#define glMultiTexCoord1fvARB		MANGLE(MultiTexCoord1fvARB)
-#define glMultiTexCoord1fv		MANGLE(MultiTexCoord1fv)
-#define glMultiTexCoord1hNV		MANGLE(MultiTexCoord1hNV)
-#define glMultiTexCoord1hvNV		MANGLE(MultiTexCoord1hvNV)
-#define glMultiTexCoord1iARB		MANGLE(MultiTexCoord1iARB)
-#define glMultiTexCoord1i		MANGLE(MultiTexCoord1i)
-#define glMultiTexCoord1ivARB		MANGLE(MultiTexCoord1ivARB)
-#define glMultiTexCoord1iv		MANGLE(MultiTexCoord1iv)
-#define glMultiTexCoord1sARB		MANGLE(MultiTexCoord1sARB)
-#define glMultiTexCoord1s		MANGLE(MultiTexCoord1s)
-#define glMultiTexCoord1svARB		MANGLE(MultiTexCoord1svARB)
-#define glMultiTexCoord1sv		MANGLE(MultiTexCoord1sv)
-#define glMultiTexCoord2dARB		MANGLE(MultiTexCoord2dARB)
-#define glMultiTexCoord2d		MANGLE(MultiTexCoord2d)
-#define glMultiTexCoord2dvARB		MANGLE(MultiTexCoord2dvARB)
-#define glMultiTexCoord2dv		MANGLE(MultiTexCoord2dv)
-#define glMultiTexCoord2fARB		MANGLE(MultiTexCoord2fARB)
-#define glMultiTexCoord2f		MANGLE(MultiTexCoord2f)
-#define glMultiTexCoord2fvARB		MANGLE(MultiTexCoord2fvARB)
-#define glMultiTexCoord2fv		MANGLE(MultiTexCoord2fv)
-#define glMultiTexCoord2hNV		MANGLE(MultiTexCoord2hNV)
-#define glMultiTexCoord2hvNV		MANGLE(MultiTexCoord2hvNV)
-#define glMultiTexCoord2iARB		MANGLE(MultiTexCoord2iARB)
-#define glMultiTexCoord2i		MANGLE(MultiTexCoord2i)
-#define glMultiTexCoord2ivARB		MANGLE(MultiTexCoord2ivARB)
-#define glMultiTexCoord2iv		MANGLE(MultiTexCoord2iv)
-#define glMultiTexCoord2sARB		MANGLE(MultiTexCoord2sARB)
-#define glMultiTexCoord2s		MANGLE(MultiTexCoord2s)
-#define glMultiTexCoord2svARB		MANGLE(MultiTexCoord2svARB)
-#define glMultiTexCoord2sv		MANGLE(MultiTexCoord2sv)
-#define glMultiTexCoord3dARB		MANGLE(MultiTexCoord3dARB)
-#define glMultiTexCoord3d		MANGLE(MultiTexCoord3d)
-#define glMultiTexCoord3dvARB		MANGLE(MultiTexCoord3dvARB)
-#define glMultiTexCoord3dv		MANGLE(MultiTexCoord3dv)
-#define glMultiTexCoord3fARB		MANGLE(MultiTexCoord3fARB)
-#define glMultiTexCoord3f		MANGLE(MultiTexCoord3f)
-#define glMultiTexCoord3fvARB		MANGLE(MultiTexCoord3fvARB)
-#define glMultiTexCoord3fv		MANGLE(MultiTexCoord3fv)
-#define glMultiTexCoord3hNV		MANGLE(MultiTexCoord3hNV)
-#define glMultiTexCoord3hvNV		MANGLE(MultiTexCoord3hvNV)
-#define glMultiTexCoord3iARB		MANGLE(MultiTexCoord3iARB)
-#define glMultiTexCoord3i		MANGLE(MultiTexCoord3i)
-#define glMultiTexCoord3ivARB		MANGLE(MultiTexCoord3ivARB)
-#define glMultiTexCoord3iv		MANGLE(MultiTexCoord3iv)
-#define glMultiTexCoord3sARB		MANGLE(MultiTexCoord3sARB)
-#define glMultiTexCoord3s		MANGLE(MultiTexCoord3s)
-#define glMultiTexCoord3svARB		MANGLE(MultiTexCoord3svARB)
-#define glMultiTexCoord3sv		MANGLE(MultiTexCoord3sv)
-#define glMultiTexCoord4dARB		MANGLE(MultiTexCoord4dARB)
-#define glMultiTexCoord4d		MANGLE(MultiTexCoord4d)
-#define glMultiTexCoord4dvARB		MANGLE(MultiTexCoord4dvARB)
-#define glMultiTexCoord4dv		MANGLE(MultiTexCoord4dv)
-#define glMultiTexCoord4fARB		MANGLE(MultiTexCoord4fARB)
-#define glMultiTexCoord4f		MANGLE(MultiTexCoord4f)
-#define glMultiTexCoord4fvARB		MANGLE(MultiTexCoord4fvARB)
-#define glMultiTexCoord4fv		MANGLE(MultiTexCoord4fv)
-#define glMultiTexCoord4hNV		MANGLE(MultiTexCoord4hNV)
-#define glMultiTexCoord4hvNV		MANGLE(MultiTexCoord4hvNV)
-#define glMultiTexCoord4iARB		MANGLE(MultiTexCoord4iARB)
-#define glMultiTexCoord4i		MANGLE(MultiTexCoord4i)
-#define glMultiTexCoord4ivARB		MANGLE(MultiTexCoord4ivARB)
-#define glMultiTexCoord4iv		MANGLE(MultiTexCoord4iv)
-#define glMultiTexCoord4sARB		MANGLE(MultiTexCoord4sARB)
-#define glMultiTexCoord4s		MANGLE(MultiTexCoord4s)
-#define glMultiTexCoord4svARB		MANGLE(MultiTexCoord4svARB)
-#define glMultiTexCoord4sv		MANGLE(MultiTexCoord4sv)
-#define glMultMatrixd		MANGLE(MultMatrixd)
-#define glMultMatrixf		MANGLE(MultMatrixf)
-#define glMultTransposeMatrixdARB		MANGLE(MultTransposeMatrixdARB)
-#define glMultTransposeMatrixd		MANGLE(MultTransposeMatrixd)
-#define glMultTransposeMatrixfARB		MANGLE(MultTransposeMatrixfARB)
-#define glMultTransposeMatrixf		MANGLE(MultTransposeMatrixf)
-#define glNewList		MANGLE(NewList)
-#define glNewObjectBufferATI		MANGLE(NewObjectBufferATI)
-#define glNewTraceMESA		MANGLE(NewTraceMESA)
-#define glNormal3b		MANGLE(Normal3b)
-#define glNormal3bv		MANGLE(Normal3bv)
-#define glNormal3d		MANGLE(Normal3d)
-#define glNormal3dv		MANGLE(Normal3dv)
-#define glNormal3f		MANGLE(Normal3f)
-#define glNormal3fVertex3fSUN		MANGLE(Normal3fVertex3fSUN)
-#define glNormal3fVertex3fvSUN		MANGLE(Normal3fVertex3fvSUN)
-#define glNormal3fv		MANGLE(Normal3fv)
-#define glNormal3hNV		MANGLE(Normal3hNV)
-#define glNormal3hvNV		MANGLE(Normal3hvNV)
-#define glNormal3i		MANGLE(Normal3i)
-#define glNormal3iv		MANGLE(Normal3iv)
-#define glNormal3s		MANGLE(Normal3s)
-#define glNormal3sv		MANGLE(Normal3sv)
-#define glNormalPointerEXT		MANGLE(NormalPointerEXT)
-#define glNormalPointerListIBM		MANGLE(NormalPointerListIBM)
-#define glNormalPointer		MANGLE(NormalPointer)
-#define glNormalPointervINTEL		MANGLE(NormalPointervINTEL)
-#define glNormalStream3bATI		MANGLE(NormalStream3bATI)
-#define glNormalStream3bvATI		MANGLE(NormalStream3bvATI)
-#define glNormalStream3dATI		MANGLE(NormalStream3dATI)
-#define glNormalStream3dvATI		MANGLE(NormalStream3dvATI)
-#define glNormalStream3fATI		MANGLE(NormalStream3fATI)
-#define glNormalStream3fvATI		MANGLE(NormalStream3fvATI)
-#define glNormalStream3iATI		MANGLE(NormalStream3iATI)
-#define glNormalStream3ivATI		MANGLE(NormalStream3ivATI)
-#define glNormalStream3sATI		MANGLE(NormalStream3sATI)
-#define glNormalStream3svATI		MANGLE(NormalStream3svATI)
-#define glOrtho		MANGLE(Ortho)
-#define glPassTexCoordATI		MANGLE(PassTexCoordATI)
-#define glPassThrough		MANGLE(PassThrough)
-#define glPixelDataRangeNV		MANGLE(PixelDataRangeNV)
-#define glPixelMapfv		MANGLE(PixelMapfv)
-#define glPixelMapuiv		MANGLE(PixelMapuiv)
-#define glPixelMapusv		MANGLE(PixelMapusv)
-#define glPixelStoref		MANGLE(PixelStoref)
-#define glPixelStorei		MANGLE(PixelStorei)
-#define glPixelTexGenParameterfSGIS		MANGLE(PixelTexGenParameterfSGIS)
-#define glPixelTexGenParameterfvSGIS		MANGLE(PixelTexGenParameterfvSGIS)
-#define glPixelTexGenParameteriSGIS		MANGLE(PixelTexGenParameteriSGIS)
-#define glPixelTexGenParameterivSGIS		MANGLE(PixelTexGenParameterivSGIS)
-#define glPixelTexGenSGIX		MANGLE(PixelTexGenSGIX)
-#define glPixelTransferf		MANGLE(PixelTransferf)
-#define glPixelTransferi		MANGLE(PixelTransferi)
-#define glPixelTransformParameterfEXT		MANGLE(PixelTransformParameterfEXT)
-#define glPixelTransformParameterfvEXT		MANGLE(PixelTransformParameterfvEXT)
-#define glPixelTransformParameteriEXT		MANGLE(PixelTransformParameteriEXT)
-#define glPixelTransformParameterivEXT		MANGLE(PixelTransformParameterivEXT)
-#define glPixelZoom		MANGLE(PixelZoom)
-#define glPNTrianglesfATI		MANGLE(PNTrianglesfATI)
-#define glPNTrianglesiATI		MANGLE(PNTrianglesiATI)
-#define glPointParameterfARB		MANGLE(PointParameterfARB)
-#define glPointParameterfEXT		MANGLE(PointParameterfEXT)
-#define glPointParameterf		MANGLE(PointParameterf)
-#define glPointParameterfSGIS		MANGLE(PointParameterfSGIS)
-#define glPointParameterfvARB		MANGLE(PointParameterfvARB)
-#define glPointParameterfvEXT		MANGLE(PointParameterfvEXT)
-#define glPointParameterfv		MANGLE(PointParameterfv)
-#define glPointParameterfvSGIS		MANGLE(PointParameterfvSGIS)
-#define glPointParameteri		MANGLE(PointParameteri)
-#define glPointParameteriNV		MANGLE(PointParameteriNV)
-#define glPointParameteriv		MANGLE(PointParameteriv)
-#define glPointParameterivNV		MANGLE(PointParameterivNV)
-#define glPointSize		MANGLE(PointSize)
-#define glPollAsyncSGIX		MANGLE(PollAsyncSGIX)
-#define glPollInstrumentsSGIX		MANGLE(PollInstrumentsSGIX)
-#define glPolygonMode		MANGLE(PolygonMode)
-#define glPolygonOffsetEXT		MANGLE(PolygonOffsetEXT)
-#define glPolygonOffset		MANGLE(PolygonOffset)
-#define glPolygonStipple		MANGLE(PolygonStipple)
-#define glPopAttrib		MANGLE(PopAttrib)
-#define glPopClientAttrib		MANGLE(PopClientAttrib)
-#define glPopMatrix		MANGLE(PopMatrix)
-#define glPopName		MANGLE(PopName)
-#define glPrimitiveRestartIndexNV		MANGLE(PrimitiveRestartIndexNV)
-#define glPrimitiveRestartNV		MANGLE(PrimitiveRestartNV)
-#define glPrioritizeTexturesEXT		MANGLE(PrioritizeTexturesEXT)
-#define glPrioritizeTextures		MANGLE(PrioritizeTextures)
-#define glProgramCallbackMESA		MANGLE(ProgramCallbackMESA)
-#define glProgramEnvParameter4dARB		MANGLE(ProgramEnvParameter4dARB)
-#define glProgramEnvParameter4dvARB		MANGLE(ProgramEnvParameter4dvARB)
-#define glProgramEnvParameter4fARB		MANGLE(ProgramEnvParameter4fARB)
-#define glProgramEnvParameter4fvARB		MANGLE(ProgramEnvParameter4fvARB)
-#define glProgramLocalParameter4dARB		MANGLE(ProgramLocalParameter4dARB)
-#define glProgramLocalParameter4dvARB		MANGLE(ProgramLocalParameter4dvARB)
-#define glProgramLocalParameter4fARB		MANGLE(ProgramLocalParameter4fARB)
-#define glProgramLocalParameter4fvARB		MANGLE(ProgramLocalParameter4fvARB)
-#define glProgramNamedParameter4dNV		MANGLE(ProgramNamedParameter4dNV)
-#define glProgramNamedParameter4dvNV		MANGLE(ProgramNamedParameter4dvNV)
-#define glProgramNamedParameter4fNV		MANGLE(ProgramNamedParameter4fNV)
-#define glProgramNamedParameter4fvNV		MANGLE(ProgramNamedParameter4fvNV)
-#define glProgramParameter4dNV		MANGLE(ProgramParameter4dNV)
-#define glProgramParameter4dvNV		MANGLE(ProgramParameter4dvNV)
-#define glProgramParameter4fNV		MANGLE(ProgramParameter4fNV)
-#define glProgramParameter4fvNV		MANGLE(ProgramParameter4fvNV)
-#define glProgramParameters4dvNV		MANGLE(ProgramParameters4dvNV)
-#define glProgramParameters4fvNV		MANGLE(ProgramParameters4fvNV)
-#define glProgramStringARB		MANGLE(ProgramStringARB)
-#define glPushAttrib		MANGLE(PushAttrib)
-#define glPushClientAttrib		MANGLE(PushClientAttrib)
-#define glPushMatrix		MANGLE(PushMatrix)
-#define glPushName		MANGLE(PushName)
-#define glRasterPos2d		MANGLE(RasterPos2d)
-#define glRasterPos2dv		MANGLE(RasterPos2dv)
-#define glRasterPos2f		MANGLE(RasterPos2f)
-#define glRasterPos2fv		MANGLE(RasterPos2fv)
-#define glRasterPos2i		MANGLE(RasterPos2i)
-#define glRasterPos2iv		MANGLE(RasterPos2iv)
-#define glRasterPos2s		MANGLE(RasterPos2s)
-#define glRasterPos2sv		MANGLE(RasterPos2sv)
-#define glRasterPos3d		MANGLE(RasterPos3d)
-#define glRasterPos3dv		MANGLE(RasterPos3dv)
-#define glRasterPos3f		MANGLE(RasterPos3f)
-#define glRasterPos3fv		MANGLE(RasterPos3fv)
-#define glRasterPos3i		MANGLE(RasterPos3i)
-#define glRasterPos3iv		MANGLE(RasterPos3iv)
-#define glRasterPos3s		MANGLE(RasterPos3s)
-#define glRasterPos3sv		MANGLE(RasterPos3sv)
-#define glRasterPos4d		MANGLE(RasterPos4d)
-#define glRasterPos4dv		MANGLE(RasterPos4dv)
-#define glRasterPos4f		MANGLE(RasterPos4f)
-#define glRasterPos4fv		MANGLE(RasterPos4fv)
-#define glRasterPos4i		MANGLE(RasterPos4i)
-#define glRasterPos4iv		MANGLE(RasterPos4iv)
-#define glRasterPos4s		MANGLE(RasterPos4s)
-#define glRasterPos4sv		MANGLE(RasterPos4sv)
-#define glReadBuffer		MANGLE(ReadBuffer)
-#define glReadInstrumentsSGIX		MANGLE(ReadInstrumentsSGIX)
-#define glReadPixels		MANGLE(ReadPixels)
-#define glRectd		MANGLE(Rectd)
-#define glRectdv		MANGLE(Rectdv)
-#define glRectf		MANGLE(Rectf)
-#define glRectfv		MANGLE(Rectfv)
-#define glRecti		MANGLE(Recti)
-#define glRectiv		MANGLE(Rectiv)
-#define glRects		MANGLE(Rects)
-#define glRectsv		MANGLE(Rectsv)
-#define glReferencePlaneSGIX		MANGLE(ReferencePlaneSGIX)
-#define glRenderbufferStorageEXT		MANGLE(RenderbufferStorageEXT)
-#define glRenderMode		MANGLE(RenderMode)
-#define glReplacementCodePointerSUN		MANGLE(ReplacementCodePointerSUN)
-#define glReplacementCodeubSUN		MANGLE(ReplacementCodeubSUN)
-#define glReplacementCodeubvSUN		MANGLE(ReplacementCodeubvSUN)
-#define glReplacementCodeuiColor3fVertex3fSUN		MANGLE(ReplacementCodeuiColor3fVertex3fSUN)
-#define glReplacementCodeuiColor3fVertex3fvSUN		MANGLE(ReplacementCodeuiColor3fVertex3fvSUN)
-#define glReplacementCodeuiColor4fNormal3fVertex3fSUN		MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fSUN)
-#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN		MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fvSUN)
-#define glReplacementCodeuiColor4ubVertex3fSUN		MANGLE(ReplacementCodeuiColor4ubVertex3fSUN)
-#define glReplacementCodeuiColor4ubVertex3fvSUN		MANGLE(ReplacementCodeuiColor4ubVertex3fvSUN)
-#define glReplacementCodeuiNormal3fVertex3fSUN		MANGLE(ReplacementCodeuiNormal3fVertex3fSUN)
-#define glReplacementCodeuiNormal3fVertex3fvSUN		MANGLE(ReplacementCodeuiNormal3fVertex3fvSUN)
-#define glReplacementCodeuiSUN		MANGLE(ReplacementCodeuiSUN)
-#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN		MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN)
-#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN		MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN)
-#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN		MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN)
-#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN		MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN)
-#define glReplacementCodeuiTexCoord2fVertex3fSUN		MANGLE(ReplacementCodeuiTexCoord2fVertex3fSUN)
-#define glReplacementCodeuiTexCoord2fVertex3fvSUN		MANGLE(ReplacementCodeuiTexCoord2fVertex3fvSUN)
-#define glReplacementCodeuiVertex3fSUN		MANGLE(ReplacementCodeuiVertex3fSUN)
-#define glReplacementCodeuiVertex3fvSUN		MANGLE(ReplacementCodeuiVertex3fvSUN)
-#define glReplacementCodeuivSUN		MANGLE(ReplacementCodeuivSUN)
-#define glReplacementCodeusSUN		MANGLE(ReplacementCodeusSUN)
-#define glReplacementCodeusvSUN		MANGLE(ReplacementCodeusvSUN)
-#define glRequestResidentProgramsNV		MANGLE(RequestResidentProgramsNV)
-#define glResetHistogramEXT		MANGLE(ResetHistogramEXT)
-#define glResetHistogram		MANGLE(ResetHistogram)
-#define glResetMinmaxEXT		MANGLE(ResetMinmaxEXT)
-#define glResetMinmax		MANGLE(ResetMinmax)
-#define glResizeBuffersMESA		MANGLE(ResizeBuffersMESA)
-#define glRotated		MANGLE(Rotated)
-#define glRotatef		MANGLE(Rotatef)
-#define glSampleCoverageARB		MANGLE(SampleCoverageARB)
-#define glSampleCoverage		MANGLE(SampleCoverage)
-#define glSampleMapATI		MANGLE(SampleMapATI)
-#define glSampleMaskEXT		MANGLE(SampleMaskEXT)
-#define glSampleMaskSGIS		MANGLE(SampleMaskSGIS)
-#define glSamplePatternEXT		MANGLE(SamplePatternEXT)
-#define glSamplePatternSGIS		MANGLE(SamplePatternSGIS)
-#define glScaled		MANGLE(Scaled)
-#define glScalef		MANGLE(Scalef)
-#define glScissor		MANGLE(Scissor)
-#define glSecondaryColor3bEXT		MANGLE(SecondaryColor3bEXT)
-#define glSecondaryColor3b		MANGLE(SecondaryColor3b)
-#define glSecondaryColor3bvEXT		MANGLE(SecondaryColor3bvEXT)
-#define glSecondaryColor3bv		MANGLE(SecondaryColor3bv)
-#define glSecondaryColor3dEXT		MANGLE(SecondaryColor3dEXT)
-#define glSecondaryColor3d		MANGLE(SecondaryColor3d)
-#define glSecondaryColor3dvEXT		MANGLE(SecondaryColor3dvEXT)
-#define glSecondaryColor3dv		MANGLE(SecondaryColor3dv)
-#define glSecondaryColor3fEXT		MANGLE(SecondaryColor3fEXT)
-#define glSecondaryColor3f		MANGLE(SecondaryColor3f)
-#define glSecondaryColor3fvEXT		MANGLE(SecondaryColor3fvEXT)
-#define glSecondaryColor3fv		MANGLE(SecondaryColor3fv)
-#define glSecondaryColor3hNV		MANGLE(SecondaryColor3hNV)
-#define glSecondaryColor3hvNV		MANGLE(SecondaryColor3hvNV)
-#define glSecondaryColor3iEXT		MANGLE(SecondaryColor3iEXT)
-#define glSecondaryColor3i		MANGLE(SecondaryColor3i)
-#define glSecondaryColor3ivEXT		MANGLE(SecondaryColor3ivEXT)
-#define glSecondaryColor3iv		MANGLE(SecondaryColor3iv)
-#define glSecondaryColor3sEXT		MANGLE(SecondaryColor3sEXT)
-#define glSecondaryColor3s		MANGLE(SecondaryColor3s)
-#define glSecondaryColor3svEXT		MANGLE(SecondaryColor3svEXT)
-#define glSecondaryColor3sv		MANGLE(SecondaryColor3sv)
-#define glSecondaryColor3ubEXT		MANGLE(SecondaryColor3ubEXT)
-#define glSecondaryColor3ub		MANGLE(SecondaryColor3ub)
-#define glSecondaryColor3ubvEXT		MANGLE(SecondaryColor3ubvEXT)
-#define glSecondaryColor3ubv		MANGLE(SecondaryColor3ubv)
-#define glSecondaryColor3uiEXT		MANGLE(SecondaryColor3uiEXT)
-#define glSecondaryColor3ui		MANGLE(SecondaryColor3ui)
-#define glSecondaryColor3uivEXT		MANGLE(SecondaryColor3uivEXT)
-#define glSecondaryColor3uiv		MANGLE(SecondaryColor3uiv)
-#define glSecondaryColor3usEXT		MANGLE(SecondaryColor3usEXT)
-#define glSecondaryColor3us		MANGLE(SecondaryColor3us)
-#define glSecondaryColor3usvEXT		MANGLE(SecondaryColor3usvEXT)
-#define glSecondaryColor3usv		MANGLE(SecondaryColor3usv)
-#define glSecondaryColorPointerEXT		MANGLE(SecondaryColorPointerEXT)
-#define glSecondaryColorPointerListIBM		MANGLE(SecondaryColorPointerListIBM)
-#define glSecondaryColorPointer		MANGLE(SecondaryColorPointer)
-#define glSelectBuffer		MANGLE(SelectBuffer)
-#define glSeparableFilter2DEXT		MANGLE(SeparableFilter2DEXT)
-#define glSeparableFilter2D		MANGLE(SeparableFilter2D)
-#define glSetFenceAPPLE		MANGLE(SetFenceAPPLE)
-#define glSetFenceNV		MANGLE(SetFenceNV)
-#define glSetFragmentShaderConstantATI		MANGLE(SetFragmentShaderConstantATI)
-#define glSetInvariantEXT		MANGLE(SetInvariantEXT)
-#define glSetLocalConstantEXT		MANGLE(SetLocalConstantEXT)
-#define glShadeModel		MANGLE(ShadeModel)
-#define glShaderOp1EXT		MANGLE(ShaderOp1EXT)
-#define glShaderOp2EXT		MANGLE(ShaderOp2EXT)
-#define glShaderOp3EXT		MANGLE(ShaderOp3EXT)
-#define glShaderSourceARB		MANGLE(ShaderSourceARB)
-#define glShaderSource		MANGLE(ShaderSource)
-#define glSharpenTexFuncSGIS		MANGLE(SharpenTexFuncSGIS)
-#define glSpriteParameterfSGIX		MANGLE(SpriteParameterfSGIX)
-#define glSpriteParameterfvSGIX		MANGLE(SpriteParameterfvSGIX)
-#define glSpriteParameteriSGIX		MANGLE(SpriteParameteriSGIX)
-#define glSpriteParameterivSGIX		MANGLE(SpriteParameterivSGIX)
-#define glStartInstrumentsSGIX		MANGLE(StartInstrumentsSGIX)
-#define glStencilFunc		MANGLE(StencilFunc)
-#define glStencilFuncSeparateATI		MANGLE(StencilFuncSeparateATI)
-#define glStencilFuncSeparate		MANGLE(StencilFuncSeparate)
-#define glStencilMask		MANGLE(StencilMask)
-#define glStencilMaskSeparate		MANGLE(StencilMaskSeparate)
-#define glStencilOp		MANGLE(StencilOp)
-#define glStencilOpSeparateATI		MANGLE(StencilOpSeparateATI)
-#define glStencilOpSeparate		MANGLE(StencilOpSeparate)
-#define glStopInstrumentsSGIX		MANGLE(StopInstrumentsSGIX)
-#define glStringMarkerGREMEDY		MANGLE(StringMarkerGREMEDY)
-#define glSwizzleEXT		MANGLE(SwizzleEXT)
-#define glTagSampleBufferSGIX		MANGLE(TagSampleBufferSGIX)
-#define glTangent3bEXT		MANGLE(Tangent3bEXT)
-#define glTangent3bvEXT		MANGLE(Tangent3bvEXT)
-#define glTangent3dEXT		MANGLE(Tangent3dEXT)
-#define glTangent3dvEXT		MANGLE(Tangent3dvEXT)
-#define glTangent3fEXT		MANGLE(Tangent3fEXT)
-#define glTangent3fvEXT		MANGLE(Tangent3fvEXT)
-#define glTangent3iEXT		MANGLE(Tangent3iEXT)
-#define glTangent3ivEXT		MANGLE(Tangent3ivEXT)
-#define glTangent3sEXT		MANGLE(Tangent3sEXT)
-#define glTangent3svEXT		MANGLE(Tangent3svEXT)
-#define glTangentPointerEXT		MANGLE(TangentPointerEXT)
-#define glTbufferMask3DFX		MANGLE(TbufferMask3DFX)
-#define glTestFenceAPPLE		MANGLE(TestFenceAPPLE)
-#define glTestFenceNV		MANGLE(TestFenceNV)
-#define glTestObjectAPPLE		MANGLE(TestObjectAPPLE)
-#define glTexBumpParameterfvATI		MANGLE(TexBumpParameterfvATI)
-#define glTexBumpParameterivATI		MANGLE(TexBumpParameterivATI)
-#define glTexCoord1d		MANGLE(TexCoord1d)
-#define glTexCoord1dv		MANGLE(TexCoord1dv)
-#define glTexCoord1f		MANGLE(TexCoord1f)
-#define glTexCoord1fv		MANGLE(TexCoord1fv)
-#define glTexCoord1hNV		MANGLE(TexCoord1hNV)
-#define glTexCoord1hvNV		MANGLE(TexCoord1hvNV)
-#define glTexCoord1i		MANGLE(TexCoord1i)
-#define glTexCoord1iv		MANGLE(TexCoord1iv)
-#define glTexCoord1s		MANGLE(TexCoord1s)
-#define glTexCoord1sv		MANGLE(TexCoord1sv)
-#define glTexCoord2d		MANGLE(TexCoord2d)
-#define glTexCoord2dv		MANGLE(TexCoord2dv)
-#define glTexCoord2fColor3fVertex3fSUN		MANGLE(TexCoord2fColor3fVertex3fSUN)
-#define glTexCoord2fColor3fVertex3fvSUN		MANGLE(TexCoord2fColor3fVertex3fvSUN)
-#define glTexCoord2fColor4fNormal3fVertex3fSUN		MANGLE(TexCoord2fColor4fNormal3fVertex3fSUN)
-#define glTexCoord2fColor4fNormal3fVertex3fvSUN		MANGLE(TexCoord2fColor4fNormal3fVertex3fvSUN)
-#define glTexCoord2fColor4ubVertex3fSUN		MANGLE(TexCoord2fColor4ubVertex3fSUN)
-#define glTexCoord2fColor4ubVertex3fvSUN		MANGLE(TexCoord2fColor4ubVertex3fvSUN)
-#define glTexCoord2f		MANGLE(TexCoord2f)
-#define glTexCoord2fNormal3fVertex3fSUN		MANGLE(TexCoord2fNormal3fVertex3fSUN)
-#define glTexCoord2fNormal3fVertex3fvSUN		MANGLE(TexCoord2fNormal3fVertex3fvSUN)
-#define glTexCoord2fVertex3fSUN		MANGLE(TexCoord2fVertex3fSUN)
-#define glTexCoord2fVertex3fvSUN		MANGLE(TexCoord2fVertex3fvSUN)
-#define glTexCoord2fv		MANGLE(TexCoord2fv)
-#define glTexCoord2hNV		MANGLE(TexCoord2hNV)
-#define glTexCoord2hvNV		MANGLE(TexCoord2hvNV)
-#define glTexCoord2i		MANGLE(TexCoord2i)
-#define glTexCoord2iv		MANGLE(TexCoord2iv)
-#define glTexCoord2s		MANGLE(TexCoord2s)
-#define glTexCoord2sv		MANGLE(TexCoord2sv)
-#define glTexCoord3d		MANGLE(TexCoord3d)
-#define glTexCoord3dv		MANGLE(TexCoord3dv)
-#define glTexCoord3f		MANGLE(TexCoord3f)
-#define glTexCoord3fv		MANGLE(TexCoord3fv)
-#define glTexCoord3hNV		MANGLE(TexCoord3hNV)
-#define glTexCoord3hvNV		MANGLE(TexCoord3hvNV)
-#define glTexCoord3i		MANGLE(TexCoord3i)
-#define glTexCoord3iv		MANGLE(TexCoord3iv)
-#define glTexCoord3s		MANGLE(TexCoord3s)
-#define glTexCoord3sv		MANGLE(TexCoord3sv)
-#define glTexCoord4d		MANGLE(TexCoord4d)
-#define glTexCoord4dv		MANGLE(TexCoord4dv)
-#define glTexCoord4fColor4fNormal3fVertex4fSUN		MANGLE(TexCoord4fColor4fNormal3fVertex4fSUN)
-#define glTexCoord4fColor4fNormal3fVertex4fvSUN		MANGLE(TexCoord4fColor4fNormal3fVertex4fvSUN)
-#define glTexCoord4f		MANGLE(TexCoord4f)
-#define glTexCoord4fVertex4fSUN		MANGLE(TexCoord4fVertex4fSUN)
-#define glTexCoord4fVertex4fvSUN		MANGLE(TexCoord4fVertex4fvSUN)
-#define glTexCoord4fv		MANGLE(TexCoord4fv)
-#define glTexCoord4hNV		MANGLE(TexCoord4hNV)
-#define glTexCoord4hvNV		MANGLE(TexCoord4hvNV)
-#define glTexCoord4i		MANGLE(TexCoord4i)
-#define glTexCoord4iv		MANGLE(TexCoord4iv)
-#define glTexCoord4s		MANGLE(TexCoord4s)
-#define glTexCoord4sv		MANGLE(TexCoord4sv)
-#define glTexCoordPointerEXT		MANGLE(TexCoordPointerEXT)
-#define glTexCoordPointerListIBM		MANGLE(TexCoordPointerListIBM)
-#define glTexCoordPointer		MANGLE(TexCoordPointer)
-#define glTexCoordPointervINTEL		MANGLE(TexCoordPointervINTEL)
-#define glTexEnvf		MANGLE(TexEnvf)
-#define glTexEnvfv		MANGLE(TexEnvfv)
-#define glTexEnvi		MANGLE(TexEnvi)
-#define glTexEnviv		MANGLE(TexEnviv)
-#define glTexFilterFuncSGIS		MANGLE(TexFilterFuncSGIS)
-#define glTexGend		MANGLE(TexGend)
-#define glTexGendv		MANGLE(TexGendv)
-#define glTexGenf		MANGLE(TexGenf)
-#define glTexGenfv		MANGLE(TexGenfv)
-#define glTexGeni		MANGLE(TexGeni)
-#define glTexGeniv		MANGLE(TexGeniv)
-#define glTexImage1D		MANGLE(TexImage1D)
-#define glTexImage2D		MANGLE(TexImage2D)
-#define glTexImage3DEXT		MANGLE(TexImage3DEXT)
-#define glTexImage3D		MANGLE(TexImage3D)
-#define glTexImage4DSGIS		MANGLE(TexImage4DSGIS)
-#define glTexParameterf		MANGLE(TexParameterf)
-#define glTexParameterfv		MANGLE(TexParameterfv)
-#define glTexParameteri		MANGLE(TexParameteri)
-#define glTexParameteriv		MANGLE(TexParameteriv)
-#define glTexSubImage1DEXT		MANGLE(TexSubImage1DEXT)
-#define glTexSubImage1D		MANGLE(TexSubImage1D)
-#define glTexSubImage2DEXT		MANGLE(TexSubImage2DEXT)
-#define glTexSubImage2D		MANGLE(TexSubImage2D)
-#define glTexSubImage3DEXT		MANGLE(TexSubImage3DEXT)
-#define glTexSubImage3D		MANGLE(TexSubImage3D)
-#define glTexSubImage4DSGIS		MANGLE(TexSubImage4DSGIS)
-#define glTextureColorMaskSGIS		MANGLE(TextureColorMaskSGIS)
-#define glTextureLightEXT		MANGLE(TextureLightEXT)
-#define glTextureMaterialEXT		MANGLE(TextureMaterialEXT)
-#define glTextureNormalEXT		MANGLE(TextureNormalEXT)
-#define glTraceAssertAttribMESA		MANGLE(TraceAssertAttribMESA)
-#define glTraceCommentMESA		MANGLE(TraceCommentMESA)
-#define glTraceListMESA		MANGLE(TraceListMESA)
-#define glTracePointerMESA		MANGLE(TracePointerMESA)
-#define glTracePointerRangeMESA		MANGLE(TracePointerRangeMESA)
-#define glTraceTextureMESA		MANGLE(TraceTextureMESA)
-#define glTrackMatrixNV		MANGLE(TrackMatrixNV)
-#define glTranslated		MANGLE(Translated)
-#define glTranslatef		MANGLE(Translatef)
-#define glUniform1fARB		MANGLE(Uniform1fARB)
-#define glUniform1f		MANGLE(Uniform1f)
-#define glUniform1fvARB		MANGLE(Uniform1fvARB)
-#define glUniform1fv		MANGLE(Uniform1fv)
-#define glUniform1iARB		MANGLE(Uniform1iARB)
-#define glUniform1i		MANGLE(Uniform1i)
-#define glUniform1ivARB		MANGLE(Uniform1ivARB)
-#define glUniform1iv		MANGLE(Uniform1iv)
-#define glUniform2fARB		MANGLE(Uniform2fARB)
-#define glUniform2f		MANGLE(Uniform2f)
-#define glUniform2fvARB		MANGLE(Uniform2fvARB)
-#define glUniform2fv		MANGLE(Uniform2fv)
-#define glUniform2iARB		MANGLE(Uniform2iARB)
-#define glUniform2i		MANGLE(Uniform2i)
-#define glUniform2ivARB		MANGLE(Uniform2ivARB)
-#define glUniform2iv		MANGLE(Uniform2iv)
-#define glUniform3fARB		MANGLE(Uniform3fARB)
-#define glUniform3f		MANGLE(Uniform3f)
-#define glUniform3fvARB		MANGLE(Uniform3fvARB)
-#define glUniform3fv		MANGLE(Uniform3fv)
-#define glUniform3iARB		MANGLE(Uniform3iARB)
-#define glUniform3i		MANGLE(Uniform3i)
-#define glUniform3ivARB		MANGLE(Uniform3ivARB)
-#define glUniform3iv		MANGLE(Uniform3iv)
-#define glUniform4fARB		MANGLE(Uniform4fARB)
-#define glUniform4f		MANGLE(Uniform4f)
-#define glUniform4fvARB		MANGLE(Uniform4fvARB)
-#define glUniform4fv		MANGLE(Uniform4fv)
-#define glUniform4iARB		MANGLE(Uniform4iARB)
-#define glUniform4i		MANGLE(Uniform4i)
-#define glUniform4ivARB		MANGLE(Uniform4ivARB)
-#define glUniform4iv		MANGLE(Uniform4iv)
-#define glUniformMatrix2fvARB		MANGLE(UniformMatrix2fvARB)
-#define glUniformMatrix2fv		MANGLE(UniformMatrix2fv)
-#define glUniformMatrix3fvARB		MANGLE(UniformMatrix3fvARB)
-#define glUniformMatrix3fv		MANGLE(UniformMatrix3fv)
-#define glUniformMatrix4fvARB		MANGLE(UniformMatrix4fvARB)
-#define glUniformMatrix4fv		MANGLE(UniformMatrix4fv)
-#define glUnlockArraysEXT		MANGLE(UnlockArraysEXT)
-#define glUnmapBufferARB		MANGLE(UnmapBufferARB)
-#define glUnmapBuffer		MANGLE(UnmapBuffer)
-#define glUnmapObjectBufferATI		MANGLE(UnmapObjectBufferATI)
-#define glUpdateObjectBufferATI		MANGLE(UpdateObjectBufferATI)
-#define glUseProgram		MANGLE(UseProgram)
-#define glUseProgramObjectARB		MANGLE(UseProgramObjectARB)
-#define glValidateProgramARB		MANGLE(ValidateProgramARB)
-#define glValidateProgram		MANGLE(ValidateProgram)
-#define glVariantArrayObjectATI		MANGLE(VariantArrayObjectATI)
-#define glVariantbvEXT		MANGLE(VariantbvEXT)
-#define glVariantdvEXT		MANGLE(VariantdvEXT)
-#define glVariantfvEXT		MANGLE(VariantfvEXT)
-#define glVariantivEXT		MANGLE(VariantivEXT)
-#define glVariantPointerEXT		MANGLE(VariantPointerEXT)
-#define glVariantsvEXT		MANGLE(VariantsvEXT)
-#define glVariantubvEXT		MANGLE(VariantubvEXT)
-#define glVariantuivEXT		MANGLE(VariantuivEXT)
-#define glVariantusvEXT		MANGLE(VariantusvEXT)
-#define glVertex2d		MANGLE(Vertex2d)
-#define glVertex2dv		MANGLE(Vertex2dv)
-#define glVertex2f		MANGLE(Vertex2f)
-#define glVertex2fv		MANGLE(Vertex2fv)
-#define glVertex2hNV		MANGLE(Vertex2hNV)
-#define glVertex2hvNV		MANGLE(Vertex2hvNV)
-#define glVertex2i		MANGLE(Vertex2i)
-#define glVertex2iv		MANGLE(Vertex2iv)
-#define glVertex2s		MANGLE(Vertex2s)
-#define glVertex2sv		MANGLE(Vertex2sv)
-#define glVertex3d		MANGLE(Vertex3d)
-#define glVertex3dv		MANGLE(Vertex3dv)
-#define glVertex3f		MANGLE(Vertex3f)
-#define glVertex3fv		MANGLE(Vertex3fv)
-#define glVertex3hNV		MANGLE(Vertex3hNV)
-#define glVertex3hvNV		MANGLE(Vertex3hvNV)
-#define glVertex3i		MANGLE(Vertex3i)
-#define glVertex3iv		MANGLE(Vertex3iv)
-#define glVertex3s		MANGLE(Vertex3s)
-#define glVertex3sv		MANGLE(Vertex3sv)
-#define glVertex4d		MANGLE(Vertex4d)
-#define glVertex4dv		MANGLE(Vertex4dv)
-#define glVertex4f		MANGLE(Vertex4f)
-#define glVertex4fv		MANGLE(Vertex4fv)
-#define glVertex4hNV		MANGLE(Vertex4hNV)
-#define glVertex4hvNV		MANGLE(Vertex4hvNV)
-#define glVertex4i		MANGLE(Vertex4i)
-#define glVertex4iv		MANGLE(Vertex4iv)
-#define glVertex4s		MANGLE(Vertex4s)
-#define glVertex4sv		MANGLE(Vertex4sv)
-#define glVertexArrayParameteriAPPLE		MANGLE(VertexArrayParameteriAPPLE)
-#define glVertexArrayRangeAPPLE		MANGLE(VertexArrayRangeAPPLE)
-#define glVertexArrayRangeNV		MANGLE(VertexArrayRangeNV)
-#define glVertexAttrib1dARB		MANGLE(VertexAttrib1dARB)
-#define glVertexAttrib1d		MANGLE(VertexAttrib1d)
-#define glVertexAttrib1dNV		MANGLE(VertexAttrib1dNV)
-#define glVertexAttrib1dvARB		MANGLE(VertexAttrib1dvARB)
-#define glVertexAttrib1dv		MANGLE(VertexAttrib1dv)
-#define glVertexAttrib1dvNV		MANGLE(VertexAttrib1dvNV)
-#define glVertexAttrib1fARB		MANGLE(VertexAttrib1fARB)
-#define glVertexAttrib1f		MANGLE(VertexAttrib1f)
-#define glVertexAttrib1fNV		MANGLE(VertexAttrib1fNV)
-#define glVertexAttrib1fvARB		MANGLE(VertexAttrib1fvARB)
-#define glVertexAttrib1fv		MANGLE(VertexAttrib1fv)
-#define glVertexAttrib1fvNV		MANGLE(VertexAttrib1fvNV)
-#define glVertexAttrib1hNV		MANGLE(VertexAttrib1hNV)
-#define glVertexAttrib1hvNV		MANGLE(VertexAttrib1hvNV)
-#define glVertexAttrib1sARB		MANGLE(VertexAttrib1sARB)
-#define glVertexAttrib1s		MANGLE(VertexAttrib1s)
-#define glVertexAttrib1sNV		MANGLE(VertexAttrib1sNV)
-#define glVertexAttrib1svARB		MANGLE(VertexAttrib1svARB)
-#define glVertexAttrib1sv		MANGLE(VertexAttrib1sv)
-#define glVertexAttrib1svNV		MANGLE(VertexAttrib1svNV)
-#define glVertexAttrib2dARB		MANGLE(VertexAttrib2dARB)
-#define glVertexAttrib2d		MANGLE(VertexAttrib2d)
-#define glVertexAttrib2dNV		MANGLE(VertexAttrib2dNV)
-#define glVertexAttrib2dvARB		MANGLE(VertexAttrib2dvARB)
-#define glVertexAttrib2dv		MANGLE(VertexAttrib2dv)
-#define glVertexAttrib2dvNV		MANGLE(VertexAttrib2dvNV)
-#define glVertexAttrib2fARB		MANGLE(VertexAttrib2fARB)
-#define glVertexAttrib2f		MANGLE(VertexAttrib2f)
-#define glVertexAttrib2fNV		MANGLE(VertexAttrib2fNV)
-#define glVertexAttrib2fvARB		MANGLE(VertexAttrib2fvARB)
-#define glVertexAttrib2fv		MANGLE(VertexAttrib2fv)
-#define glVertexAttrib2fvNV		MANGLE(VertexAttrib2fvNV)
-#define glVertexAttrib2hNV		MANGLE(VertexAttrib2hNV)
-#define glVertexAttrib2hvNV		MANGLE(VertexAttrib2hvNV)
-#define glVertexAttrib2sARB		MANGLE(VertexAttrib2sARB)
-#define glVertexAttrib2s		MANGLE(VertexAttrib2s)
-#define glVertexAttrib2sNV		MANGLE(VertexAttrib2sNV)
-#define glVertexAttrib2svARB		MANGLE(VertexAttrib2svARB)
-#define glVertexAttrib2sv		MANGLE(VertexAttrib2sv)
-#define glVertexAttrib2svNV		MANGLE(VertexAttrib2svNV)
-#define glVertexAttrib3dARB		MANGLE(VertexAttrib3dARB)
-#define glVertexAttrib3d		MANGLE(VertexAttrib3d)
-#define glVertexAttrib3dNV		MANGLE(VertexAttrib3dNV)
-#define glVertexAttrib3dvARB		MANGLE(VertexAttrib3dvARB)
-#define glVertexAttrib3dv		MANGLE(VertexAttrib3dv)
-#define glVertexAttrib3dvNV		MANGLE(VertexAttrib3dvNV)
-#define glVertexAttrib3fARB		MANGLE(VertexAttrib3fARB)
-#define glVertexAttrib3f		MANGLE(VertexAttrib3f)
-#define glVertexAttrib3fNV		MANGLE(VertexAttrib3fNV)
-#define glVertexAttrib3fvARB		MANGLE(VertexAttrib3fvARB)
-#define glVertexAttrib3fv		MANGLE(VertexAttrib3fv)
-#define glVertexAttrib3fvNV		MANGLE(VertexAttrib3fvNV)
-#define glVertexAttrib3hNV		MANGLE(VertexAttrib3hNV)
-#define glVertexAttrib3hvNV		MANGLE(VertexAttrib3hvNV)
-#define glVertexAttrib3sARB		MANGLE(VertexAttrib3sARB)
-#define glVertexAttrib3s		MANGLE(VertexAttrib3s)
-#define glVertexAttrib3sNV		MANGLE(VertexAttrib3sNV)
-#define glVertexAttrib3svARB		MANGLE(VertexAttrib3svARB)
-#define glVertexAttrib3sv		MANGLE(VertexAttrib3sv)
-#define glVertexAttrib3svNV		MANGLE(VertexAttrib3svNV)
-#define glVertexAttrib4bvARB		MANGLE(VertexAttrib4bvARB)
-#define glVertexAttrib4bv		MANGLE(VertexAttrib4bv)
-#define glVertexAttrib4dARB		MANGLE(VertexAttrib4dARB)
-#define glVertexAttrib4d		MANGLE(VertexAttrib4d)
-#define glVertexAttrib4dNV		MANGLE(VertexAttrib4dNV)
-#define glVertexAttrib4dvARB		MANGLE(VertexAttrib4dvARB)
-#define glVertexAttrib4dv		MANGLE(VertexAttrib4dv)
-#define glVertexAttrib4dvNV		MANGLE(VertexAttrib4dvNV)
-#define glVertexAttrib4fARB		MANGLE(VertexAttrib4fARB)
-#define glVertexAttrib4f		MANGLE(VertexAttrib4f)
-#define glVertexAttrib4fNV		MANGLE(VertexAttrib4fNV)
-#define glVertexAttrib4fvARB		MANGLE(VertexAttrib4fvARB)
-#define glVertexAttrib4fv		MANGLE(VertexAttrib4fv)
-#define glVertexAttrib4fvNV		MANGLE(VertexAttrib4fvNV)
-#define glVertexAttrib4hNV		MANGLE(VertexAttrib4hNV)
-#define glVertexAttrib4hvNV		MANGLE(VertexAttrib4hvNV)
-#define glVertexAttrib4ivARB		MANGLE(VertexAttrib4ivARB)
-#define glVertexAttrib4iv		MANGLE(VertexAttrib4iv)
-#define glVertexAttrib4NbvARB		MANGLE(VertexAttrib4NbvARB)
-#define glVertexAttrib4Nbv		MANGLE(VertexAttrib4Nbv)
-#define glVertexAttrib4NivARB		MANGLE(VertexAttrib4NivARB)
-#define glVertexAttrib4Niv		MANGLE(VertexAttrib4Niv)
-#define glVertexAttrib4NsvARB		MANGLE(VertexAttrib4NsvARB)
-#define glVertexAttrib4Nsv		MANGLE(VertexAttrib4Nsv)
-#define glVertexAttrib4NubARB		MANGLE(VertexAttrib4NubARB)
-#define glVertexAttrib4Nub		MANGLE(VertexAttrib4Nub)
-#define glVertexAttrib4NubvARB		MANGLE(VertexAttrib4NubvARB)
-#define glVertexAttrib4Nubv		MANGLE(VertexAttrib4Nubv)
-#define glVertexAttrib4NuivARB		MANGLE(VertexAttrib4NuivARB)
-#define glVertexAttrib4Nuiv		MANGLE(VertexAttrib4Nuiv)
-#define glVertexAttrib4NusvARB		MANGLE(VertexAttrib4NusvARB)
-#define glVertexAttrib4Nusv		MANGLE(VertexAttrib4Nusv)
-#define glVertexAttrib4sARB		MANGLE(VertexAttrib4sARB)
-#define glVertexAttrib4s		MANGLE(VertexAttrib4s)
-#define glVertexAttrib4sNV		MANGLE(VertexAttrib4sNV)
-#define glVertexAttrib4svARB		MANGLE(VertexAttrib4svARB)
-#define glVertexAttrib4sv		MANGLE(VertexAttrib4sv)
-#define glVertexAttrib4svNV		MANGLE(VertexAttrib4svNV)
-#define glVertexAttrib4ubNV		MANGLE(VertexAttrib4ubNV)
-#define glVertexAttrib4ubvARB		MANGLE(VertexAttrib4ubvARB)
-#define glVertexAttrib4ubv		MANGLE(VertexAttrib4ubv)
-#define glVertexAttrib4ubvNV		MANGLE(VertexAttrib4ubvNV)
-#define glVertexAttrib4uivARB		MANGLE(VertexAttrib4uivARB)
-#define glVertexAttrib4uiv		MANGLE(VertexAttrib4uiv)
-#define glVertexAttrib4usvARB		MANGLE(VertexAttrib4usvARB)
-#define glVertexAttrib4usv		MANGLE(VertexAttrib4usv)
-#define glVertexAttribArrayObjectATI		MANGLE(VertexAttribArrayObjectATI)
-#define glVertexAttribPointerARB		MANGLE(VertexAttribPointerARB)
-#define glVertexAttribPointer		MANGLE(VertexAttribPointer)
-#define glVertexAttribPointerNV		MANGLE(VertexAttribPointerNV)
-#define glVertexAttribs1dvNV		MANGLE(VertexAttribs1dvNV)
-#define glVertexAttribs1fvNV		MANGLE(VertexAttribs1fvNV)
-#define glVertexAttribs1hvNV		MANGLE(VertexAttribs1hvNV)
-#define glVertexAttribs1svNV		MANGLE(VertexAttribs1svNV)
-#define glVertexAttribs2dvNV		MANGLE(VertexAttribs2dvNV)
-#define glVertexAttribs2fvNV		MANGLE(VertexAttribs2fvNV)
-#define glVertexAttribs2hvNV		MANGLE(VertexAttribs2hvNV)
-#define glVertexAttribs2svNV		MANGLE(VertexAttribs2svNV)
-#define glVertexAttribs3dvNV		MANGLE(VertexAttribs3dvNV)
-#define glVertexAttribs3fvNV		MANGLE(VertexAttribs3fvNV)
-#define glVertexAttribs3hvNV		MANGLE(VertexAttribs3hvNV)
-#define glVertexAttribs3svNV		MANGLE(VertexAttribs3svNV)
-#define glVertexAttribs4dvNV		MANGLE(VertexAttribs4dvNV)
-#define glVertexAttribs4fvNV		MANGLE(VertexAttribs4fvNV)
-#define glVertexAttribs4hvNV		MANGLE(VertexAttribs4hvNV)
-#define glVertexAttribs4svNV		MANGLE(VertexAttribs4svNV)
-#define glVertexAttribs4ubvNV		MANGLE(VertexAttribs4ubvNV)
-#define glVertexBlendARB		MANGLE(VertexBlendARB)
-#define glVertexBlendEnvfATI		MANGLE(VertexBlendEnvfATI)
-#define glVertexBlendEnviATI		MANGLE(VertexBlendEnviATI)
-#define glVertexPointerEXT		MANGLE(VertexPointerEXT)
-#define glVertexPointerListIBM		MANGLE(VertexPointerListIBM)
-#define glVertexPointer		MANGLE(VertexPointer)
-#define glVertexPointervINTEL		MANGLE(VertexPointervINTEL)
-#define glVertexStream1dATI		MANGLE(VertexStream1dATI)
-#define glVertexStream1dvATI		MANGLE(VertexStream1dvATI)
-#define glVertexStream1fATI		MANGLE(VertexStream1fATI)
-#define glVertexStream1fvATI		MANGLE(VertexStream1fvATI)
-#define glVertexStream1iATI		MANGLE(VertexStream1iATI)
-#define glVertexStream1ivATI		MANGLE(VertexStream1ivATI)
-#define glVertexStream1sATI		MANGLE(VertexStream1sATI)
-#define glVertexStream1svATI		MANGLE(VertexStream1svATI)
-#define glVertexStream2dATI		MANGLE(VertexStream2dATI)
-#define glVertexStream2dvATI		MANGLE(VertexStream2dvATI)
-#define glVertexStream2fATI		MANGLE(VertexStream2fATI)
-#define glVertexStream2fvATI		MANGLE(VertexStream2fvATI)
-#define glVertexStream2iATI		MANGLE(VertexStream2iATI)
-#define glVertexStream2ivATI		MANGLE(VertexStream2ivATI)
-#define glVertexStream2sATI		MANGLE(VertexStream2sATI)
-#define glVertexStream2svATI		MANGLE(VertexStream2svATI)
-#define glVertexStream3dATI		MANGLE(VertexStream3dATI)
-#define glVertexStream3dvATI		MANGLE(VertexStream3dvATI)
-#define glVertexStream3fATI		MANGLE(VertexStream3fATI)
-#define glVertexStream3fvATI		MANGLE(VertexStream3fvATI)
-#define glVertexStream3iATI		MANGLE(VertexStream3iATI)
-#define glVertexStream3ivATI		MANGLE(VertexStream3ivATI)
-#define glVertexStream3sATI		MANGLE(VertexStream3sATI)
-#define glVertexStream3svATI		MANGLE(VertexStream3svATI)
-#define glVertexStream4dATI		MANGLE(VertexStream4dATI)
-#define glVertexStream4dvATI		MANGLE(VertexStream4dvATI)
-#define glVertexStream4fATI		MANGLE(VertexStream4fATI)
-#define glVertexStream4fvATI		MANGLE(VertexStream4fvATI)
-#define glVertexStream4iATI		MANGLE(VertexStream4iATI)
-#define glVertexStream4ivATI		MANGLE(VertexStream4ivATI)
-#define glVertexStream4sATI		MANGLE(VertexStream4sATI)
-#define glVertexStream4svATI		MANGLE(VertexStream4svATI)
-#define glVertexWeightfEXT		MANGLE(VertexWeightfEXT)
-#define glVertexWeightfvEXT		MANGLE(VertexWeightfvEXT)
-#define glVertexWeighthNV		MANGLE(VertexWeighthNV)
-#define glVertexWeighthvNV		MANGLE(VertexWeighthvNV)
-#define glVertexWeightPointerEXT		MANGLE(VertexWeightPointerEXT)
-#define glViewport		MANGLE(Viewport)
-#define glWeightbvARB		MANGLE(WeightbvARB)
-#define glWeightdvARB		MANGLE(WeightdvARB)
-#define glWeightfvARB		MANGLE(WeightfvARB)
-#define glWeightivARB		MANGLE(WeightivARB)
-#define glWeightPointerARB		MANGLE(WeightPointerARB)
-#define glWeightsvARB		MANGLE(WeightsvARB)
-#define glWeightubvARB		MANGLE(WeightubvARB)
-#define glWeightuivARB		MANGLE(WeightuivARB)
-#define glWeightusvARB		MANGLE(WeightusvARB)
-#define glWindowPos2dARB		MANGLE(WindowPos2dARB)
-#define glWindowPos2d		MANGLE(WindowPos2d)
-#define glWindowPos2dMESA		MANGLE(WindowPos2dMESA)
-#define glWindowPos2dvARB		MANGLE(WindowPos2dvARB)
-#define glWindowPos2dv		MANGLE(WindowPos2dv)
-#define glWindowPos2dvMESA		MANGLE(WindowPos2dvMESA)
-#define glWindowPos2fARB		MANGLE(WindowPos2fARB)
-#define glWindowPos2f		MANGLE(WindowPos2f)
-#define glWindowPos2fMESA		MANGLE(WindowPos2fMESA)
-#define glWindowPos2fvARB		MANGLE(WindowPos2fvARB)
-#define glWindowPos2fv		MANGLE(WindowPos2fv)
-#define glWindowPos2fvMESA		MANGLE(WindowPos2fvMESA)
-#define glWindowPos2iARB		MANGLE(WindowPos2iARB)
-#define glWindowPos2i		MANGLE(WindowPos2i)
-#define glWindowPos2iMESA		MANGLE(WindowPos2iMESA)
-#define glWindowPos2ivARB		MANGLE(WindowPos2ivARB)
-#define glWindowPos2iv		MANGLE(WindowPos2iv)
-#define glWindowPos2ivMESA		MANGLE(WindowPos2ivMESA)
-#define glWindowPos2sARB		MANGLE(WindowPos2sARB)
-#define glWindowPos2s		MANGLE(WindowPos2s)
-#define glWindowPos2sMESA		MANGLE(WindowPos2sMESA)
-#define glWindowPos2svARB		MANGLE(WindowPos2svARB)
-#define glWindowPos2sv		MANGLE(WindowPos2sv)
-#define glWindowPos2svMESA		MANGLE(WindowPos2svMESA)
-#define glWindowPos3dARB		MANGLE(WindowPos3dARB)
-#define glWindowPos3d		MANGLE(WindowPos3d)
-#define glWindowPos3dMESA		MANGLE(WindowPos3dMESA)
-#define glWindowPos3dvARB		MANGLE(WindowPos3dvARB)
-#define glWindowPos3dv		MANGLE(WindowPos3dv)
-#define glWindowPos3dvMESA		MANGLE(WindowPos3dvMESA)
-#define glWindowPos3fARB		MANGLE(WindowPos3fARB)
-#define glWindowPos3f		MANGLE(WindowPos3f)
-#define glWindowPos3fMESA		MANGLE(WindowPos3fMESA)
-#define glWindowPos3fvARB		MANGLE(WindowPos3fvARB)
-#define glWindowPos3fv		MANGLE(WindowPos3fv)
-#define glWindowPos3fvMESA		MANGLE(WindowPos3fvMESA)
-#define glWindowPos3iARB		MANGLE(WindowPos3iARB)
-#define glWindowPos3i		MANGLE(WindowPos3i)
-#define glWindowPos3iMESA		MANGLE(WindowPos3iMESA)
-#define glWindowPos3ivARB		MANGLE(WindowPos3ivARB)
-#define glWindowPos3iv		MANGLE(WindowPos3iv)
-#define glWindowPos3ivMESA		MANGLE(WindowPos3ivMESA)
-#define glWindowPos3sARB		MANGLE(WindowPos3sARB)
-#define glWindowPos3s		MANGLE(WindowPos3s)
-#define glWindowPos3sMESA		MANGLE(WindowPos3sMESA)
-#define glWindowPos3svARB		MANGLE(WindowPos3svARB)
-#define glWindowPos3sv		MANGLE(WindowPos3sv)
-#define glWindowPos3svMESA		MANGLE(WindowPos3svMESA)
-#define glWindowPos4dMESA		MANGLE(WindowPos4dMESA)
-#define glWindowPos4dvMESA		MANGLE(WindowPos4dvMESA)
-#define glWindowPos4fMESA		MANGLE(WindowPos4fMESA)
-#define glWindowPos4fvMESA		MANGLE(WindowPos4fvMESA)
-#define glWindowPos4iMESA		MANGLE(WindowPos4iMESA)
-#define glWindowPos4ivMESA		MANGLE(WindowPos4ivMESA)
-#define glWindowPos4sMESA		MANGLE(WindowPos4sMESA)
-#define glWindowPos4svMESA		MANGLE(WindowPos4svMESA)
-#define glWriteMaskEXT		MANGLE(WriteMaskEXT)
-
-#endif /* GL_MANGLE_H */
diff --git a/nx-X11/extras/Mesa/include/GL/glfbdev.h b/nx-X11/extras/Mesa/include/GL/glfbdev.h
deleted file mode 100644
index 6af3ac314..000000000
--- a/nx-X11/extras/Mesa/include/GL/glfbdev.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  5.1
- *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef GLFBDEV_H
-#define GLFBDEV_H
-
-
-/* avoid including linux/fb.h */
-struct fb_fix_screeninfo;
-struct fb_var_screeninfo;
-
-
-/* public types */
-typedef struct GLFBDevVisualRec *GLFBDevVisualPtr;
-typedef struct GLFBDevBufferRec *GLFBDevBufferPtr;
-typedef struct GLFBDevContextRec *GLFBDevContextPtr;
-
-
-/* API version */
-#define GLFBDEV_VERSION_1_0       1
-
-
-/* For glFBDevCreateVisual */
-#define GLFBDEV_DOUBLE_BUFFER   100
-#define GLFBDEV_COLOR_INDEX     101
-#define GLFBDEV_DEPTH_SIZE      102
-#define GLFBDEV_STENCIL_SIZE    103
-#define GLFBDEV_ACCUM_SIZE      104
-#define GLFBDEV_LEVEL           105
-#define GLFBDEV_NONE              0
-
-/* For glFBDevGetString */
-#define GLFBDEV_VERSION         200
-#define GLFBDEV_VENDOR          201
-
-
-/* Misc functions */
-
-extern const char *
-glFBDevGetString( int str );
-
-
-typedef void (*GLFBDevProc)();
-
-
-extern const GLFBDevProc
-glFBDevGetProcAddress( const char *procName );
-
-
-
-/**
- * Create a GLFBDevVisual.
- * \param fixInfo - needed to get the visual types, etc.
- * \param varInfo - needed to get the bits_per_pixel, etc.
- * \param attribs - for requesting depth, stencil, accum buffers, etc.
- */
-extern GLFBDevVisualPtr
-glFBDevCreateVisual( const struct fb_fix_screeninfo *fixInfo,
-                     const struct fb_var_screeninfo *varInfo,
-                     const int *attribs );
-
-extern void
-glFBDevDestroyVisual( GLFBDevVisualPtr visual );
-
-extern int
-glFBDevGetVisualAttrib( const GLFBDevVisualPtr visual, int attrib);
-
-
-
-/**
- * Create a GLFBDevBuffer.
- * \param fixInfo, varInfo - needed in order to get the screen size
- * (resolution), etc.
- * \param visual - as returned by glFBDevCreateVisual()
- * \param frontBuffer - address of front color buffer
- * \param backBuffer - address of back color buffer (may be NULL)
- * \param size - size of the color buffer(s) in bytes.
- */
-extern GLFBDevBufferPtr
-glFBDevCreateBuffer( const struct fb_fix_screeninfo *fixInfo,
-                     const struct fb_var_screeninfo *varInfo,
-                     const GLFBDevVisualPtr visual,
-                     void *frontBuffer, void *backBuffer, size_t size );
-
-extern void
-glFBDevDestroyBuffer( GLFBDevBufferPtr buffer );
-
-extern int
-glFBDevGetBufferAttrib( const GLFBDevBufferPtr buffer, int attrib);
-
-extern GLFBDevBufferPtr
-glFBDevGetCurrentDrawBuffer( void );
-
-extern GLFBDevBufferPtr
-glFBDevGetCurrentReadBuffer( void );
-
-extern void
-glFBDevSwapBuffers( GLFBDevBufferPtr buffer );
-
-
-
-/**
- * Create a GLFBDevContext.
- * \param visual - as created by glFBDevCreateVisual.
- * \param share - specifies another context with which to share textures,
- * display lists, etc. (may be NULL).
- */
-extern GLFBDevContextPtr
-glFBDevCreateContext( const GLFBDevVisualPtr visual, GLFBDevContextPtr share );
-
-extern void
-glFBDevDestroyContext( GLFBDevContextPtr context );
-
-extern int
-glFBDevGetContextAttrib( const GLFBDevContextPtr context, int attrib);
-
-extern GLFBDevContextPtr
-glFBDevGetCurrentContext( void );
-
-extern int
-glFBDevMakeCurrent( GLFBDevContextPtr context,
-                    GLFBDevBufferPtr drawBuffer,
-                    GLFBDevBufferPtr readBuffer );
-
-
-#endif /* GLFBDEV_H */
diff --git a/nx-X11/extras/Mesa/include/GL/glu.h b/nx-X11/extras/Mesa/include/GL/glu.h
deleted file mode 100644
index c0bac75a8..000000000
--- a/nx-X11/extras/Mesa/include/GL/glu.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
-
-#ifndef __glu_h__
-#define __glu_h__
-
-#if defined(USE_MGL_NAMESPACE)
-#include "glu_mangle.h"
-#endif
-
-#include <GL/gl.h>
-
-#ifndef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
-#ifndef GLAPIENTRYP
-#define GLAPIENTRYP GLAPIENTRY *
-#endif
-
-#ifndef GLAPI
-#define GLAPI
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*************************************************************/
-
-/* Extensions */
-#define GLU_EXT_object_space_tess          1
-#define GLU_EXT_nurbs_tessellator          1
-
-/* Boolean */
-#define GLU_FALSE                          0
-#define GLU_TRUE                           1
-
-/* Version */
-#define GLU_VERSION_1_1                    1
-#define GLU_VERSION_1_2                    1
-#define GLU_VERSION_1_3                    1
-
-/* StringName */
-#define GLU_VERSION                        100800
-#define GLU_EXTENSIONS                     100801
-
-/* ErrorCode */
-#define GLU_INVALID_ENUM                   100900
-#define GLU_INVALID_VALUE                  100901
-#define GLU_OUT_OF_MEMORY                  100902
-#define GLU_INCOMPATIBLE_GL_VERSION        100903
-#define GLU_INVALID_OPERATION              100904
-
-/* NurbsDisplay */
-/*      GLU_FILL */
-#define GLU_OUTLINE_POLYGON                100240
-#define GLU_OUTLINE_PATCH                  100241
-
-/* NurbsCallback */
-#define GLU_NURBS_ERROR                    100103
-#define GLU_ERROR                          100103
-#define GLU_NURBS_BEGIN                    100164
-#define GLU_NURBS_BEGIN_EXT                100164
-#define GLU_NURBS_VERTEX                   100165
-#define GLU_NURBS_VERTEX_EXT               100165
-#define GLU_NURBS_NORMAL                   100166
-#define GLU_NURBS_NORMAL_EXT               100166
-#define GLU_NURBS_COLOR                    100167
-#define GLU_NURBS_COLOR_EXT                100167
-#define GLU_NURBS_TEXTURE_COORD            100168
-#define GLU_NURBS_TEX_COORD_EXT            100168
-#define GLU_NURBS_END                      100169
-#define GLU_NURBS_END_EXT                  100169
-#define GLU_NURBS_BEGIN_DATA               100170
-#define GLU_NURBS_BEGIN_DATA_EXT           100170
-#define GLU_NURBS_VERTEX_DATA              100171
-#define GLU_NURBS_VERTEX_DATA_EXT          100171
-#define GLU_NURBS_NORMAL_DATA              100172
-#define GLU_NURBS_NORMAL_DATA_EXT          100172
-#define GLU_NURBS_COLOR_DATA               100173
-#define GLU_NURBS_COLOR_DATA_EXT           100173
-#define GLU_NURBS_TEXTURE_COORD_DATA       100174
-#define GLU_NURBS_TEX_COORD_DATA_EXT       100174
-#define GLU_NURBS_END_DATA                 100175
-#define GLU_NURBS_END_DATA_EXT             100175
-
-/* NurbsError */
-#define GLU_NURBS_ERROR1                   100251
-#define GLU_NURBS_ERROR2                   100252
-#define GLU_NURBS_ERROR3                   100253
-#define GLU_NURBS_ERROR4                   100254
-#define GLU_NURBS_ERROR5                   100255
-#define GLU_NURBS_ERROR6                   100256
-#define GLU_NURBS_ERROR7                   100257
-#define GLU_NURBS_ERROR8                   100258
-#define GLU_NURBS_ERROR9                   100259
-#define GLU_NURBS_ERROR10                  100260
-#define GLU_NURBS_ERROR11                  100261
-#define GLU_NURBS_ERROR12                  100262
-#define GLU_NURBS_ERROR13                  100263
-#define GLU_NURBS_ERROR14                  100264
-#define GLU_NURBS_ERROR15                  100265
-#define GLU_NURBS_ERROR16                  100266
-#define GLU_NURBS_ERROR17                  100267
-#define GLU_NURBS_ERROR18                  100268
-#define GLU_NURBS_ERROR19                  100269
-#define GLU_NURBS_ERROR20                  100270
-#define GLU_NURBS_ERROR21                  100271
-#define GLU_NURBS_ERROR22                  100272
-#define GLU_NURBS_ERROR23                  100273
-#define GLU_NURBS_ERROR24                  100274
-#define GLU_NURBS_ERROR25                  100275
-#define GLU_NURBS_ERROR26                  100276
-#define GLU_NURBS_ERROR27                  100277
-#define GLU_NURBS_ERROR28                  100278
-#define GLU_NURBS_ERROR29                  100279
-#define GLU_NURBS_ERROR30                  100280
-#define GLU_NURBS_ERROR31                  100281
-#define GLU_NURBS_ERROR32                  100282
-#define GLU_NURBS_ERROR33                  100283
-#define GLU_NURBS_ERROR34                  100284
-#define GLU_NURBS_ERROR35                  100285
-#define GLU_NURBS_ERROR36                  100286
-#define GLU_NURBS_ERROR37                  100287
-
-/* NurbsProperty */
-#define GLU_AUTO_LOAD_MATRIX               100200
-#define GLU_CULLING                        100201
-#define GLU_SAMPLING_TOLERANCE             100203
-#define GLU_DISPLAY_MODE                   100204
-#define GLU_PARAMETRIC_TOLERANCE           100202
-#define GLU_SAMPLING_METHOD                100205
-#define GLU_U_STEP                         100206
-#define GLU_V_STEP                         100207
-#define GLU_NURBS_MODE                     100160
-#define GLU_NURBS_MODE_EXT                 100160
-#define GLU_NURBS_TESSELLATOR              100161
-#define GLU_NURBS_TESSELLATOR_EXT          100161
-#define GLU_NURBS_RENDERER                 100162
-#define GLU_NURBS_RENDERER_EXT             100162
-
-/* NurbsSampling */
-#define GLU_OBJECT_PARAMETRIC_ERROR        100208
-#define GLU_OBJECT_PARAMETRIC_ERROR_EXT    100208
-#define GLU_OBJECT_PATH_LENGTH             100209
-#define GLU_OBJECT_PATH_LENGTH_EXT         100209
-#define GLU_PATH_LENGTH                    100215
-#define GLU_PARAMETRIC_ERROR               100216
-#define GLU_DOMAIN_DISTANCE                100217
-
-/* NurbsTrim */
-#define GLU_MAP1_TRIM_2                    100210
-#define GLU_MAP1_TRIM_3                    100211
-
-/* QuadricDrawStyle */
-#define GLU_POINT                          100010
-#define GLU_LINE                           100011
-#define GLU_FILL                           100012
-#define GLU_SILHOUETTE                     100013
-
-/* QuadricCallback */
-/*      GLU_ERROR */
-
-/* QuadricNormal */
-#define GLU_SMOOTH                         100000
-#define GLU_FLAT                           100001
-#define GLU_NONE                           100002
-
-/* QuadricOrientation */
-#define GLU_OUTSIDE                        100020
-#define GLU_INSIDE                         100021
-
-/* TessCallback */
-#define GLU_TESS_BEGIN                     100100
-#define GLU_BEGIN                          100100
-#define GLU_TESS_VERTEX                    100101
-#define GLU_VERTEX                         100101
-#define GLU_TESS_END                       100102
-#define GLU_END                            100102
-#define GLU_TESS_ERROR                     100103
-#define GLU_TESS_EDGE_FLAG                 100104
-#define GLU_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
-
-/* TessContour */
-#define GLU_CW                             100120
-#define GLU_CCW                            100121
-#define GLU_INTERIOR                       100122
-#define GLU_EXTERIOR                       100123
-#define GLU_UNKNOWN                        100124
-
-/* TessProperty */
-#define GLU_TESS_WINDING_RULE              100140
-#define GLU_TESS_BOUNDARY_ONLY             100141
-#define GLU_TESS_TOLERANCE                 100142
-
-/* TessError */
-#define GLU_TESS_ERROR1                    100151
-#define GLU_TESS_ERROR2                    100152
-#define GLU_TESS_ERROR3                    100153
-#define GLU_TESS_ERROR4                    100154
-#define GLU_TESS_ERROR5                    100155
-#define GLU_TESS_ERROR6                    100156
-#define GLU_TESS_ERROR7                    100157
-#define GLU_TESS_ERROR8                    100158
-#define GLU_TESS_MISSING_BEGIN_POLYGON     100151
-#define GLU_TESS_MISSING_BEGIN_CONTOUR     100152
-#define GLU_TESS_MISSING_END_POLYGON       100153
-#define GLU_TESS_MISSING_END_CONTOUR       100154
-#define GLU_TESS_COORD_TOO_LARGE           100155
-#define GLU_TESS_NEED_COMBINE_CALLBACK     100156
-
-/* TessWinding */
-#define GLU_TESS_WINDING_ODD               100130
-#define GLU_TESS_WINDING_NONZERO           100131
-#define GLU_TESS_WINDING_POSITIVE          100132
-#define GLU_TESS_WINDING_NEGATIVE          100133
-#define GLU_TESS_WINDING_ABS_GEQ_TWO       100134
-
-/*************************************************************/
-
-
-#ifdef __cplusplus
-class GLUnurbs;
-class GLUquadric;
-class GLUtesselator;
-#else
-typedef struct GLUnurbs GLUnurbs;
-typedef struct GLUquadric GLUquadric;
-typedef struct GLUtesselator GLUtesselator;
-#endif
-
-typedef GLUnurbs GLUnurbsObj;
-typedef GLUquadric GLUquadricObj;
-typedef GLUtesselator GLUtesselatorObj;
-typedef GLUtesselator GLUtriangulatorObj;
-
-#define GLU_TESS_MAX_COORD 1.0e150
-
-/* Internal convenience typedefs */
-typedef void (GLAPIENTRYP _GLUfuncptr)();
-
-GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluBeginSurface (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluBeginTrim (GLUnurbs* nurb);
-GLAPI GLint GLAPIENTRY gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
-GLAPI GLint GLAPIENTRY gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
-GLAPI GLboolean GLAPIENTRY gluCheckExtension (const GLubyte *extName, const GLubyte *extString);
-GLAPI void GLAPIENTRY gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);
-GLAPI void GLAPIENTRY gluDeleteNurbsRenderer (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluDeleteQuadric (GLUquadric* quad);
-GLAPI void GLAPIENTRY gluDeleteTess (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops);
-GLAPI void GLAPIENTRY gluEndCurve (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluEndPolygon (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluEndSurface (GLUnurbs* nurb);
-GLAPI void GLAPIENTRY gluEndTrim (GLUnurbs* nurb);
-GLAPI const GLubyte * GLAPIENTRY gluErrorString (GLenum error);
-GLAPI void GLAPIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);
-GLAPI const GLubyte * GLAPIENTRY gluGetString (GLenum name);
-GLAPI void GLAPIENTRY gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data);
-GLAPI void GLAPIENTRY gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view);
-GLAPI void GLAPIENTRY gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ);
-GLAPI GLUnurbs* GLAPIENTRY gluNewNurbsRenderer (void);
-GLAPI GLUquadric* GLAPIENTRY gluNewQuadric (void);
-GLAPI GLUtesselator* GLAPIENTRY gluNewTess (void);
-GLAPI void GLAPIENTRY gluNextContour (GLUtesselator* tess, GLenum type);
-GLAPI void GLAPIENTRY gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);
-GLAPI void GLAPIENTRY gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData);
-GLAPI void GLAPIENTRY gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData);
-GLAPI void GLAPIENTRY gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);
-GLAPI void GLAPIENTRY gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);
-GLAPI void GLAPIENTRY gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type);
-GLAPI void GLAPIENTRY gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top);
-GLAPI void GLAPIENTRY gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep);
-GLAPI void GLAPIENTRY gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);
-GLAPI void GLAPIENTRY gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport);
-GLAPI GLint GLAPIENTRY gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ);
-GLAPI void GLAPIENTRY gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type);
-GLAPI void GLAPIENTRY gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc);
-GLAPI void GLAPIENTRY gluQuadricDrawStyle (GLUquadric* quad, GLenum draw);
-GLAPI void GLAPIENTRY gluQuadricNormals (GLUquadric* quad, GLenum normal);
-GLAPI void GLAPIENTRY gluQuadricOrientation (GLUquadric* quad, GLenum orientation);
-GLAPI void GLAPIENTRY gluQuadricTexture (GLUquadric* quad, GLboolean texture);
-GLAPI GLint GLAPIENTRY gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut);
-GLAPI void GLAPIENTRY gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks);
-GLAPI void GLAPIENTRY gluTessBeginContour (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
-GLAPI void GLAPIENTRY gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
-GLAPI void GLAPIENTRY gluTessEndContour (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluTessEndPolygon (GLUtesselator* tess);
-GLAPI void GLAPIENTRY gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
-GLAPI void GLAPIENTRY gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
-GLAPI void GLAPIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
-GLAPI GLint GLAPIENTRY gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ);
-GLAPI GLint GLAPIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __glu_h__ */
diff --git a/nx-X11/extras/Mesa/include/GL/glu_mangle.h b/nx-X11/extras/Mesa/include/GL/glu_mangle.h
deleted file mode 100644
index 9c25aa864..000000000
--- a/nx-X11/extras/Mesa/include/GL/glu_mangle.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.0
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#ifndef GLU_MANGLE_H
-#define GLU_MANGLE_H
-
-
-#define gluLookAt mgluLookAt
-#define gluOrtho2D mgluOrtho2D
-#define gluPerspective mgluPerspective
-#define gluPickMatrix mgluPickMatrix
-#define gluProject mgluProject
-#define gluUnProject mgluUnProject
-#define gluErrorString mgluErrorString
-#define gluScaleImage mgluScaleImage
-#define gluBuild1DMipmaps mgluBuild1DMipmaps
-#define gluBuild2DMipmaps mgluBuild2DMipmaps
-#define gluNewQuadric mgluNewQuadric
-#define gluDeleteQuadric mgluDeleteQuadric
-#define gluQuadricDrawStyle mgluQuadricDrawStyle
-#define gluQuadricOrientation mgluQuadricOrientation
-#define gluQuadricNormals mgluQuadricNormals
-#define gluQuadricTexture mgluQuadricTexture
-#define gluQuadricCallback mgluQuadricCallback
-#define gluCylinder mgluCylinder
-#define gluSphere mgluSphere
-#define gluDisk mgluDisk
-#define gluPartialDisk mgluPartialDisk
-#define gluNewNurbsRenderer mgluNewNurbsRenderer
-#define gluDeleteNurbsRenderer mgluDeleteNurbsRenderer
-#define gluLoadSamplingMatrices mgluLoadSamplingMatrices
-#define gluNurbsProperty mgluNurbsProperty
-#define gluGetNurbsProperty mgluGetNurbsProperty
-#define gluBeginCurve mgluBeginCurve
-#define gluEndCurve mgluEndCurve
-#define gluNurbsCurve mgluNurbsCurve
-#define gluBeginSurface mgluBeginSurface
-#define gluEndSurface mgluEndSurface
-#define gluNurbsSurface mgluNurbsSurface
-#define gluBeginTrim mgluBeginTrim
-#define gluEndTrim mgluEndTrim
-#define gluPwlCurve mgluPwlCurve
-#define gluNurbsCallback mgluNurbsCallback
-#define gluNewTess mgluNewTess
-#define gluDeleteTess mgluDeleteTess
-#define gluTessBeginPolygon mgluTessBeginPolygon
-#define gluTessBeginContour mgluTessBeginContour
-#define gluTessVertex mgluTessVertex
-#define gluTessEndPolygon mgluTessEndPolygon
-#define gluTessEndContour mgluTessEndContour
-#define gluTessProperty mgluTessProperty
-#define gluTessNormal mgluTessNormal
-#define gluTessCallback mgluTessCallback
-#define gluGetTessProperty mgluGetTessProperty
-#define gluBeginPolygon mgluBeginPolygon
-#define gluNextContour mgluNextContour
-#define gluEndPolygon mgluEndPolygon
-#define gluGetString mgluGetString
-#define gluBuild1DMipmapLevels mgluBuild1DMipmapLevels
-#define gluBuild2DMipmapLevels mgluBuild2DMipmapLevels
-#define gluBuild3DMipmapLevels mgluBuild3DMipmapLevels
-#define gluBuild3DMipmaps mgluBuild3DMipmaps
-#define gluCheckExtension mgluCheckExtension
-#define gluUnProject4 mgluUnProject4
-#define gluNurbsCallbackData mgluNurbsCallbackData
-#define gluNurbsCallbackDataEXT mgluNurbsCallbackDataEXT
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/glut.h b/nx-X11/extras/Mesa/include/GL/glut.h
deleted file mode 100644
index 23c740ee1..000000000
--- a/nx-X11/extras/Mesa/include/GL/glut.h
+++ /dev/null
@@ -1,748 +0,0 @@
-#ifndef __glut_h__
-#define __glut_h__
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. */
-
-/* This program is freely distributable without licensing fees  and is
-   provided without guarantee or warrantee expressed or  implied. This
-   program is -not- in the public domain. */
-
-#include <GL/gl.h>
-#include <GL/glu.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(_WIN32)
-
-/* GLUT 3.7 now tries to avoid including <windows.h>
-   to avoid name space pollution, but Win32's <GL/gl.h>
-   needs APIENTRY and WINGDIAPI defined properly.
-
-   tjump@spgs.com contributes:
-   If users are building glut code on MS Windows, then they should
-   make sure they include windows.h early, let's not get into a
-   header definitions war since MS has proven it's capability to
-   change header dependencies w/o publishing they have done so.
-
-   So, let's not include windows.h here, as it's not really required and
-   MS own gl/gl.h *should* include it if the dependency is there. */
-
-/* To disable automatic library usage for GLUT, define GLUT_NO_LIB_PRAGMA
-   in your compile preprocessor options. */
-# if !defined(GLUT_BUILDING_LIB) && !defined(GLUT_NO_LIB_PRAGMA)
-#  pragma comment (lib, "winmm.lib")      /* link with Windows MultiMedia lib */
-/* To enable automatic SGI OpenGL for Windows library usage for GLUT,
-   define GLUT_USE_SGI_OPENGL in your compile preprocessor options.  */
-#  ifdef GLUT_USE_SGI_OPENGL
-#   pragma comment (lib, "opengl.lib")    /* link with SGI OpenGL for Windows lib */
-#   pragma comment (lib, "glu.lib")       /* link with SGI OpenGL Utility lib */
-#   pragma comment (lib, "glut.lib")      /* link with Win32 GLUT for SGI OpenGL lib */
-#  else
-#   pragma comment (lib, "opengl32.lib")  /* link with Microsoft OpenGL lib */
-#   pragma comment (lib, "glu32.lib")     /* link with Microsoft OpenGL Utility lib */
-#   pragma comment (lib, "glut32.lib")    /* link with Win32 GLUT lib */
-#  endif
-# endif
-
-/* To disable supression of annoying warnings about floats being promoted
-   to doubles, define GLUT_NO_WARNING_DISABLE in your compile preprocessor
-   options. */
-# ifndef GLUT_NO_WARNING_DISABLE
-#  pragma warning (disable:4244)  /* Disable bogus VC++ 4.2 conversion warnings. */
-#  pragma warning (disable:4305)  /* VC++ 5.0 version of above warning. */
-# endif
-
-/* Win32 has an annoying issue where there are multiple C run-time
-   libraries (CRTs).  If the executable is linked with a different CRT
-   from the GLUT DLL, the GLUT DLL will not share the same CRT static
-   data seen by the executable.  In particular, atexit callbacks registered
-   in the executable will not be called if GLUT calls its (different)
-   exit routine).  GLUT is typically built with the
-   "/MD" option (the CRT with multithreading DLL support), but the Visual
-   C++ linker default is "/ML" (the single threaded CRT).
-
-   One workaround to this issue is requiring users to always link with
-   the same CRT as GLUT is compiled with.  That requires users supply a
-   non-standard option.  GLUT 3.7 has its own built-in workaround where
-   the executable's "exit" function pointer is covertly passed to GLUT.
-   GLUT then calls the executable's exit function pointer to ensure that
-   any "atexit" calls registered by the application are called if GLUT
-   needs to exit.
-
-   Note that the __glut*WithExit routines should NEVER be called directly.
-   To avoid the atexit workaround, #define GLUT_DISABLE_ATEXIT_HACK. */
-
-/* XXX This is from Win32's <process.h> */
-# if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__cdecl)
-   /* Define __cdecl for non-Microsoft compilers. */
-#  define __cdecl
-#  define GLUT_DEFINED___CDECL
-# endif
-# ifndef _CRTIMP
-#  ifdef _NTSDK
-    /* Definition compatible with NT SDK */
-#   define _CRTIMP
-#  else
-    /* Current definition */
-#   ifdef _DLL
-#    define _CRTIMP __declspec(dllimport)
-#   else
-#    define _CRTIMP
-#   endif
-#  endif
-#  define GLUT_DEFINED__CRTIMP
-# endif
-# ifndef GLUT_BUILDING_LIB
-extern _CRTIMP void __cdecl exit(int);
-# endif
-
-/* GLUT callback calling convention for Win32. */
-# define GLUTCALLBACK __cdecl
-
-/* for callback/function pointer defs */
-# define GLUTAPIENTRYV __cdecl
-
-/* glut-win32 specific macros, defined to prevent collision with
-   and redifinition of Windows system defs, also removes requirement of
-   pretty much any standard windows header from this file */
-
-#if (_MSC_VER >= 800) || defined(__MINGW32__) || defined(_STDCALL_SUPPORTED) || defined(__CYGWIN32__)
-#	define GLUTAPIENTRY __stdcall
-#else
-#	define GLUTAPIENTRY
-#endif
-
-/* GLUT API entry point declarations for Win32. */
-#if defined(GLUT_BUILDING_LIB) && defined(_DLL)
-# 	define GLUTAPI __declspec(dllexport)
-#elif defined(_DLL)
-#   define GLUTAPI __declspec(dllimport)
-#else
-#	define GLUTAPI extern
-#endif
-
-#if defined(_WIN32) && !defined(_WINDEF_) && !defined(MESA)
-#	if !defined(MESA_MINWARN)
-#		pragma message( "note: WINDOWS.H not included, providing Mesa definition of CALLBACK macro" )
-#		pragma message( "----: and PROC typedef. If you receive compiler warnings about either ")
-#		pragma message( "----: being multiply defined you should include WINDOWS.H priot to gl/glut.h" )
-#	endif
-#	define CALLBACK __stdcall
-typedef int (GLUTAPIENTRY *PROC)();
-typedef void *HGLRC;
-typedef void *HDC;
-typedef unsigned long COLORREF;
-#endif
-
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(MESA)
-#	if !defined(MESA_MINWARN)
-#		pragma message( "note: WINDOWS.H not included, providing Mesa definition of wgl functions" )
-#		pragma message( "----: and macros. If you receive compiler warnings about any being multiply ")
-#		pragma message( "----: defined you should include WINDOWS.H priot to gl/glut.h" )
-#	endif
-#	define WGL_FONT_LINES      0
-#	define WGL_FONT_POLYGONS   1
-#	ifdef UNICODE
-#		define wglUseFontBitmaps  wglUseFontBitmapsW
-#		define wglUseFontOutlines  wglUseFontOutlinesW
-#	else
-#		define wglUseFontBitmaps  wglUseFontBitmapsA
-#		define wglUseFontOutlines  wglUseFontOutlinesA
-#	endif /* !UNICODE */
-typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
-typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
-#  pragma warning( push )
-#  pragma warning( disable : 4273 ) /* 'function' : inconsistent DLL linkage. dllexport assumed. */
-#  define WGLAPI __declspec(dllimport)
-WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
-WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC,HGLRC);
-WGLAPI int   GLAPIENTRY wglSetPixelFormat(HDC, int, const PIXELFORMATDESCRIPTOR *);
-WGLAPI int   GLAPIENTRY wglSwapBuffers(HDC hdc);
-WGLAPI HDC   GLAPIENTRY wglGetCurrentDC(void);
-WGLAPI HGLRC GLAPIENTRY wglCreateContext(HDC);
-WGLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC,int);
-WGLAPI HGLRC GLAPIENTRY wglGetCurrentContext(void);
-WGLAPI PROC  GLAPIENTRY wglGetProcAddress(const char*);
-WGLAPI int   GLAPIENTRY wglChoosePixelFormat(HDC, const PIXELFORMATDESCRIPTOR *);
-WGLAPI int   GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int);
-WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
-WGLAPI int   GLAPIENTRY wglDescribeLayerPlane(HDC, int, int, unsigned int,LPLAYERPLANEDESCRIPTOR);
-WGLAPI int   GLAPIENTRY wglDescribePixelFormat(HDC,int, unsigned int, LPPIXELFORMATDESCRIPTOR);
-WGLAPI int   GLAPIENTRY wglGetLayerPaletteEntries(HDC, int, int, int,COLORREF *);
-WGLAPI int   GLAPIENTRY wglGetPixelFormat(HDC hdc);
-WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC, HGLRC);
-WGLAPI int   GLAPIENTRY wglRealizeLayerPalette(HDC, int, int);
-WGLAPI int   GLAPIENTRY wglSetLayerPaletteEntries(HDC, int, int, int,const COLORREF *);
-WGLAPI int   GLAPIENTRY wglShareLists(HGLRC, HGLRC);
-WGLAPI int   GLAPIENTRY wglSwapLayerBuffers(HDC, unsigned int);
-WGLAPI int   GLAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, unsigned long);
-WGLAPI int   GLAPIENTRY wglUseFontBitmapsW(HDC, unsigned long, unsigned long, unsigned long);
-WGLAPI int   GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
-WGLAPI int   GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
-WGLAPI int   GLAPIENTRY SwapBuffers(HDC);
-WGLAPI int   GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *);
-WGLAPI int   GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,LPPIXELFORMATDESCRIPTOR);
-WGLAPI int   GLAPIENTRY GetPixelFormat(HDC);
-WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
-#  undef WGLAPI
-#  pragma warning( pop )
-#endif
-
-#else /* _WIN32 not defined */
-
-/* Define GLUTAPIENTRY and GLUTCALLBACK to nothing if we aren't on Win32. */
-#  define GLUTAPIENTRY GLAPIENTRY
-#  define GLUTAPIENTRYV
-#  define GLUTCALLBACK
-#  define GLUTAPI extern
-
-#endif
-
-
-/**
- GLUT API revision history:
-
- GLUT_API_VERSION is updated to reflect incompatible GLUT
- API changes (interface changes, semantic changes, deletions,
- or additions).
-
- GLUT_API_VERSION=1  First public release of GLUT.  11/29/94
-
- GLUT_API_VERSION=2  Added support for OpenGL/GLX multisampling,
- extension.  Supports new input devices like tablet, dial and button
- box, and Spaceball.  Easy to query OpenGL extensions.
-
- GLUT_API_VERSION=3  glutMenuStatus added.
-
- GLUT_API_VERSION=4  glutInitDisplayString, glutWarpPointer,
- glutBitmapLength, glutStrokeLength, glutWindowStatusFunc, dynamic
- video resize subAPI, glutPostWindowRedisplay, glutKeyboardUpFunc,
- glutSpecialUpFunc, glutIgnoreKeyRepeat, glutSetKeyRepeat,
- glutJoystickFunc, glutForceJoystickFunc (NOT FINALIZED!).
-
- GLUT_API_VERSION=5  glutGetProcAddress (added by BrianP)
-**/
-#ifndef GLUT_API_VERSION  /* allow this to be overriden */
-#define GLUT_API_VERSION		5
-#endif
-
-/**
- GLUT implementation revision history:
-
- GLUT_XLIB_IMPLEMENTATION is updated to reflect both GLUT
- API revisions and implementation revisions (ie, bug fixes).
-
- GLUT_XLIB_IMPLEMENTATION=1  mjk's first public release of
- GLUT Xlib-based implementation.  11/29/94
-
- GLUT_XLIB_IMPLEMENTATION=2  mjk's second public release of
- GLUT Xlib-based implementation providing GLUT version 2
- interfaces.
-
- GLUT_XLIB_IMPLEMENTATION=3  mjk's GLUT 2.2 images. 4/17/95
-
- GLUT_XLIB_IMPLEMENTATION=4  mjk's GLUT 2.3 images. 6/?/95
-
- GLUT_XLIB_IMPLEMENTATION=5  mjk's GLUT 3.0 images. 10/?/95
-
- GLUT_XLIB_IMPLEMENTATION=7  mjk's GLUT 3.1+ with glutWarpPoitner.  7/24/96
-
- GLUT_XLIB_IMPLEMENTATION=8  mjk's GLUT 3.1+ with glutWarpPoitner
- and video resize.  1/3/97
-
- GLUT_XLIB_IMPLEMENTATION=9 mjk's GLUT 3.4 release with early GLUT 4 routines.
-
- GLUT_XLIB_IMPLEMENTATION=11 Mesa 2.5's GLUT 3.6 release.
-
- GLUT_XLIB_IMPLEMENTATION=12 mjk's GLUT 3.6 release with early GLUT 4 routines + signal handling.
-
- GLUT_XLIB_IMPLEMENTATION=13 mjk's GLUT 3.7 beta with GameGLUT support.
-
- GLUT_XLIB_IMPLEMENTATION=14 mjk's GLUT 3.7 beta with f90gl friend interface.
-
- GLUT_XLIB_IMPLEMENTATION=15 mjk's GLUT 3.7 beta sync'ed with Mesa <GL/glut.h>
-**/
-#ifndef GLUT_XLIB_IMPLEMENTATION  /* Allow this to be overriden. */
-#define GLUT_XLIB_IMPLEMENTATION	15
-#endif
-
-/* Display mode bit masks. */
-#define GLUT_RGB			0
-#define GLUT_RGBA			GLUT_RGB
-#define GLUT_INDEX			1
-#define GLUT_SINGLE			0
-#define GLUT_DOUBLE			2
-#define GLUT_ACCUM			4
-#define GLUT_ALPHA			8
-#define GLUT_DEPTH			16
-#define GLUT_STENCIL			32
-#if (GLUT_API_VERSION >= 2)
-#define GLUT_MULTISAMPLE		128
-#define GLUT_STEREO			256
-#endif
-#if (GLUT_API_VERSION >= 3)
-#define GLUT_LUMINANCE			512
-#endif
-
-/* Mouse buttons. */
-#define GLUT_LEFT_BUTTON		0
-#define GLUT_MIDDLE_BUTTON		1
-#define GLUT_RIGHT_BUTTON		2
-
-/* Mouse button  state. */
-#define GLUT_DOWN			0
-#define GLUT_UP				1
-
-#if (GLUT_API_VERSION >= 2)
-/* function keys */
-#define GLUT_KEY_F1			1
-#define GLUT_KEY_F2			2
-#define GLUT_KEY_F3			3
-#define GLUT_KEY_F4			4
-#define GLUT_KEY_F5			5
-#define GLUT_KEY_F6			6
-#define GLUT_KEY_F7			7
-#define GLUT_KEY_F8			8
-#define GLUT_KEY_F9			9
-#define GLUT_KEY_F10			10
-#define GLUT_KEY_F11			11
-#define GLUT_KEY_F12			12
-/* directional keys */
-#define GLUT_KEY_LEFT			100
-#define GLUT_KEY_UP			101
-#define GLUT_KEY_RIGHT			102
-#define GLUT_KEY_DOWN			103
-#define GLUT_KEY_PAGE_UP		104
-#define GLUT_KEY_PAGE_DOWN		105
-#define GLUT_KEY_HOME			106
-#define GLUT_KEY_END			107
-#define GLUT_KEY_INSERT			108
-#endif
-
-/* Entry/exit  state. */
-#define GLUT_LEFT			0
-#define GLUT_ENTERED			1
-
-/* Menu usage  state. */
-#define GLUT_MENU_NOT_IN_USE		0
-#define GLUT_MENU_IN_USE		1
-
-/* Visibility  state. */
-#define GLUT_NOT_VISIBLE		0
-#define GLUT_VISIBLE			1
-
-/* Window status  state. */
-#define GLUT_HIDDEN			0
-#define GLUT_FULLY_RETAINED		1
-#define GLUT_PARTIALLY_RETAINED		2
-#define GLUT_FULLY_COVERED		3
-
-/* Color index component selection values. */
-#define GLUT_RED			0
-#define GLUT_GREEN			1
-#define GLUT_BLUE			2
-
-/* Layers for use. */
-#define GLUT_NORMAL			0
-#define GLUT_OVERLAY			1
-
-#if defined(_WIN32) || defined (GLUT_IMPORT_LIB)
-/* Stroke font constants (use these in GLUT program). */
-#define GLUT_STROKE_ROMAN		((void*)0)
-#define GLUT_STROKE_MONO_ROMAN		((void*)1)
-
-/* Bitmap font constants (use these in GLUT program). */
-#define GLUT_BITMAP_9_BY_15		((void*)2)
-#define GLUT_BITMAP_8_BY_13		((void*)3)
-#define GLUT_BITMAP_TIMES_ROMAN_10	((void*)4)
-#define GLUT_BITMAP_TIMES_ROMAN_24	((void*)5)
-#if (GLUT_API_VERSION >= 3)
-#define GLUT_BITMAP_HELVETICA_10	((void*)6)
-#define GLUT_BITMAP_HELVETICA_12	((void*)7)
-#define GLUT_BITMAP_HELVETICA_18	((void*)8)
-#endif
-#else
-/* Stroke font opaque addresses (use constants instead in source code). */
-GLUTAPI void *glutStrokeRoman;
-GLUTAPI void *glutStrokeMonoRoman;
-
-/* Stroke font constants (use these in GLUT program). */
-#define GLUT_STROKE_ROMAN		(&glutStrokeRoman)
-#define GLUT_STROKE_MONO_ROMAN		(&glutStrokeMonoRoman)
-
-/* Bitmap font opaque addresses (use constants instead in source code). */
-GLUTAPI void *glutBitmap9By15;
-GLUTAPI void *glutBitmap8By13;
-GLUTAPI void *glutBitmapTimesRoman10;
-GLUTAPI void *glutBitmapTimesRoman24;
-GLUTAPI void *glutBitmapHelvetica10;
-GLUTAPI void *glutBitmapHelvetica12;
-GLUTAPI void *glutBitmapHelvetica18;
-
-/* Bitmap font constants (use these in GLUT program). */
-#define GLUT_BITMAP_9_BY_15		(&glutBitmap9By15)
-#define GLUT_BITMAP_8_BY_13		(&glutBitmap8By13)
-#define GLUT_BITMAP_TIMES_ROMAN_10	(&glutBitmapTimesRoman10)
-#define GLUT_BITMAP_TIMES_ROMAN_24	(&glutBitmapTimesRoman24)
-#if (GLUT_API_VERSION >= 3)
-#define GLUT_BITMAP_HELVETICA_10	(&glutBitmapHelvetica10)
-#define GLUT_BITMAP_HELVETICA_12	(&glutBitmapHelvetica12)
-#define GLUT_BITMAP_HELVETICA_18	(&glutBitmapHelvetica18)
-#endif
-#endif
-
-/* glutGet parameters. */
-#define GLUT_WINDOW_X			100
-#define GLUT_WINDOW_Y			101
-#define GLUT_WINDOW_WIDTH		102
-#define GLUT_WINDOW_HEIGHT		103
-#define GLUT_WINDOW_BUFFER_SIZE		104
-#define GLUT_WINDOW_STENCIL_SIZE	105
-#define GLUT_WINDOW_DEPTH_SIZE		106
-#define GLUT_WINDOW_RED_SIZE		107
-#define GLUT_WINDOW_GREEN_SIZE		108
-#define GLUT_WINDOW_BLUE_SIZE		109
-#define GLUT_WINDOW_ALPHA_SIZE		110
-#define GLUT_WINDOW_ACCUM_RED_SIZE	111
-#define GLUT_WINDOW_ACCUM_GREEN_SIZE	112
-#define GLUT_WINDOW_ACCUM_BLUE_SIZE	113
-#define GLUT_WINDOW_ACCUM_ALPHA_SIZE	114
-#define GLUT_WINDOW_DOUBLEBUFFER	115
-#define GLUT_WINDOW_RGBA		116
-#define GLUT_WINDOW_PARENT		117
-#define GLUT_WINDOW_NUM_CHILDREN	118
-#define GLUT_WINDOW_COLORMAP_SIZE	119
-#if (GLUT_API_VERSION >= 2)
-#define GLUT_WINDOW_NUM_SAMPLES		120
-#define GLUT_WINDOW_STEREO		121
-#endif
-#if (GLUT_API_VERSION >= 3)
-#define GLUT_WINDOW_CURSOR		122
-#endif
-#define GLUT_SCREEN_WIDTH		200
-#define GLUT_SCREEN_HEIGHT		201
-#define GLUT_SCREEN_WIDTH_MM		202
-#define GLUT_SCREEN_HEIGHT_MM		203
-#define GLUT_MENU_NUM_ITEMS		300
-#define GLUT_DISPLAY_MODE_POSSIBLE	400
-#define GLUT_INIT_WINDOW_X		500
-#define GLUT_INIT_WINDOW_Y		501
-#define GLUT_INIT_WINDOW_WIDTH		502
-#define GLUT_INIT_WINDOW_HEIGHT		503
-#define GLUT_INIT_DISPLAY_MODE		504
-#if (GLUT_API_VERSION >= 2)
-#define GLUT_ELAPSED_TIME		700
-#endif
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
-#define GLUT_WINDOW_FORMAT_ID		123
-#endif
-
-#if (GLUT_API_VERSION >= 2)
-/* glutDeviceGet parameters. */
-#define GLUT_HAS_KEYBOARD		600
-#define GLUT_HAS_MOUSE			601
-#define GLUT_HAS_SPACEBALL		602
-#define GLUT_HAS_DIAL_AND_BUTTON_BOX	603
-#define GLUT_HAS_TABLET			604
-#define GLUT_NUM_MOUSE_BUTTONS		605
-#define GLUT_NUM_SPACEBALL_BUTTONS	606
-#define GLUT_NUM_BUTTON_BOX_BUTTONS	607
-#define GLUT_NUM_DIALS			608
-#define GLUT_NUM_TABLET_BUTTONS		609
-#endif
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
-#define GLUT_DEVICE_IGNORE_KEY_REPEAT   610
-#define GLUT_DEVICE_KEY_REPEAT          611
-#define GLUT_HAS_JOYSTICK		612
-#define GLUT_OWNS_JOYSTICK		613
-#define GLUT_JOYSTICK_BUTTONS		614
-#define GLUT_JOYSTICK_AXES		615
-#define GLUT_JOYSTICK_POLL_RATE		616
-#endif
-
-#if (GLUT_API_VERSION >= 3)
-/* glutLayerGet parameters. */
-#define GLUT_OVERLAY_POSSIBLE           800
-#define GLUT_LAYER_IN_USE		801
-#define GLUT_HAS_OVERLAY		802
-#define GLUT_TRANSPARENT_INDEX		803
-#define GLUT_NORMAL_DAMAGED		804
-#define GLUT_OVERLAY_DAMAGED		805
-
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-/* glutVideoResizeGet parameters. */
-#define GLUT_VIDEO_RESIZE_POSSIBLE	900
-#define GLUT_VIDEO_RESIZE_IN_USE	901
-#define GLUT_VIDEO_RESIZE_X_DELTA	902
-#define GLUT_VIDEO_RESIZE_Y_DELTA	903
-#define GLUT_VIDEO_RESIZE_WIDTH_DELTA	904
-#define GLUT_VIDEO_RESIZE_HEIGHT_DELTA	905
-#define GLUT_VIDEO_RESIZE_X		906
-#define GLUT_VIDEO_RESIZE_Y		907
-#define GLUT_VIDEO_RESIZE_WIDTH		908
-#define GLUT_VIDEO_RESIZE_HEIGHT	909
-#endif
-
-/* glutUseLayer parameters. */
-#define GLUT_NORMAL			0
-#define GLUT_OVERLAY			1
-
-/* glutGetModifiers return mask. */
-#define GLUT_ACTIVE_SHIFT               1
-#define GLUT_ACTIVE_CTRL                2
-#define GLUT_ACTIVE_ALT                 4
-
-/* glutSetCursor parameters. */
-/* Basic arrows. */
-#define GLUT_CURSOR_RIGHT_ARROW		0
-#define GLUT_CURSOR_LEFT_ARROW		1
-/* Symbolic cursor shapes. */
-#define GLUT_CURSOR_INFO		2
-#define GLUT_CURSOR_DESTROY		3
-#define GLUT_CURSOR_HELP		4
-#define GLUT_CURSOR_CYCLE		5
-#define GLUT_CURSOR_SPRAY		6
-#define GLUT_CURSOR_WAIT		7
-#define GLUT_CURSOR_TEXT		8
-#define GLUT_CURSOR_CROSSHAIR		9
-/* Directional cursors. */
-#define GLUT_CURSOR_UP_DOWN		10
-#define GLUT_CURSOR_LEFT_RIGHT		11
-/* Sizing cursors. */
-#define GLUT_CURSOR_TOP_SIDE		12
-#define GLUT_CURSOR_BOTTOM_SIDE		13
-#define GLUT_CURSOR_LEFT_SIDE		14
-#define GLUT_CURSOR_RIGHT_SIDE		15
-#define GLUT_CURSOR_TOP_LEFT_CORNER	16
-#define GLUT_CURSOR_TOP_RIGHT_CORNER	17
-#define GLUT_CURSOR_BOTTOM_RIGHT_CORNER	18
-#define GLUT_CURSOR_BOTTOM_LEFT_CORNER	19
-/* Inherit from parent window. */
-#define GLUT_CURSOR_INHERIT		100
-/* Blank cursor. */
-#define GLUT_CURSOR_NONE		101
-/* Fullscreen crosshair (if available). */
-#define GLUT_CURSOR_FULL_CROSSHAIR	102
-#endif
-
-/* GLUT initialization sub-API. */
-GLUTAPI void GLUTAPIENTRY glutInit(int *argcp, char **argv);
-#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK)
-GLUTAPI void GLUTAPIENTRY __glutInitWithExit(int *argcp, char **argv, void (__cdecl *exitfunc)(int));
-#ifndef GLUT_BUILDING_LIB
-static void GLUTAPIENTRY glutInit_ATEXIT_HACK(int *argcp, char **argv) { __glutInitWithExit(argcp, argv, exit); }
-#define glutInit glutInit_ATEXIT_HACK
-#endif
-#endif
-GLUTAPI void GLUTAPIENTRY glutInitDisplayMode(unsigned int mode);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-GLUTAPI void GLUTAPIENTRY glutInitDisplayString(const char *string);
-#endif
-GLUTAPI void GLUTAPIENTRY glutInitWindowPosition(int x, int y);
-GLUTAPI void GLUTAPIENTRY glutInitWindowSize(int width, int height);
-GLUTAPI void GLUTAPIENTRY glutMainLoop(void);
-
-/* GLUT window sub-API. */
-GLUTAPI int GLUTAPIENTRY glutCreateWindow(const char *title);
-#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK)
-GLUTAPI int GLUTAPIENTRY __glutCreateWindowWithExit(const char *title, void (__cdecl *exitfunc)(int));
-#ifndef GLUT_BUILDING_LIB
-static int GLUTAPIENTRY glutCreateWindow_ATEXIT_HACK(const char *title) { return __glutCreateWindowWithExit(title, exit); }
-#define glutCreateWindow glutCreateWindow_ATEXIT_HACK
-#endif
-#endif
-GLUTAPI int GLUTAPIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height);
-GLUTAPI void GLUTAPIENTRY glutDestroyWindow(int win);
-GLUTAPI void GLUTAPIENTRY glutPostRedisplay(void);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11)
-GLUTAPI void GLUTAPIENTRY glutPostWindowRedisplay(int win);
-#endif
-GLUTAPI void GLUTAPIENTRY glutSwapBuffers(void);
-GLUTAPI int GLUTAPIENTRY glutGetWindow(void);
-GLUTAPI void GLUTAPIENTRY glutSetWindow(int win);
-GLUTAPI void GLUTAPIENTRY glutSetWindowTitle(const char *title);
-GLUTAPI void GLUTAPIENTRY glutSetIconTitle(const char *title);
-GLUTAPI void GLUTAPIENTRY glutPositionWindow(int x, int y);
-GLUTAPI void GLUTAPIENTRY glutReshapeWindow(int width, int height);
-GLUTAPI void GLUTAPIENTRY glutPopWindow(void);
-GLUTAPI void GLUTAPIENTRY glutPushWindow(void);
-GLUTAPI void GLUTAPIENTRY glutIconifyWindow(void);
-GLUTAPI void GLUTAPIENTRY glutShowWindow(void);
-GLUTAPI void GLUTAPIENTRY glutHideWindow(void);
-#if (GLUT_API_VERSION >= 3)
-GLUTAPI void GLUTAPIENTRY glutFullScreen(void);
-GLUTAPI void GLUTAPIENTRY glutSetCursor(int cursor);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-GLUTAPI void GLUTAPIENTRY glutWarpPointer(int x, int y);
-#endif
-
-/* GLUT overlay sub-API. */
-GLUTAPI void GLUTAPIENTRY glutEstablishOverlay(void);
-GLUTAPI void GLUTAPIENTRY glutRemoveOverlay(void);
-GLUTAPI void GLUTAPIENTRY glutUseLayer(GLenum layer);
-GLUTAPI void GLUTAPIENTRY glutPostOverlayRedisplay(void);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11)
-GLUTAPI void GLUTAPIENTRY glutPostWindowOverlayRedisplay(int win);
-#endif
-GLUTAPI void GLUTAPIENTRY glutShowOverlay(void);
-GLUTAPI void GLUTAPIENTRY glutHideOverlay(void);
-#endif
-
-/* GLUT menu sub-API. */
-GLUTAPI int GLUTAPIENTRY glutCreateMenu(void (GLUTCALLBACK *func)(int));
-#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK)
-GLUTAPI int GLUTAPIENTRY __glutCreateMenuWithExit(void (GLUTCALLBACK *func)(int), void (__cdecl *exitfunc)(int));
-#ifndef GLUT_BUILDING_LIB
-static int GLUTAPIENTRY glutCreateMenu_ATEXIT_HACK(void (GLUTCALLBACK *func)(int)) { return __glutCreateMenuWithExit(func, exit); }
-#define glutCreateMenu glutCreateMenu_ATEXIT_HACK
-#endif
-#endif
-GLUTAPI void GLUTAPIENTRY glutDestroyMenu(int menu);
-GLUTAPI int GLUTAPIENTRY glutGetMenu(void);
-GLUTAPI void GLUTAPIENTRY glutSetMenu(int menu);
-GLUTAPI void GLUTAPIENTRY glutAddMenuEntry(const char *label, int value);
-GLUTAPI void GLUTAPIENTRY glutAddSubMenu(const char *label, int submenu);
-GLUTAPI void GLUTAPIENTRY glutChangeToMenuEntry(int item, const char *label, int value);
-GLUTAPI void GLUTAPIENTRY glutChangeToSubMenu(int item, const char *label, int submenu);
-GLUTAPI void GLUTAPIENTRY glutRemoveMenuItem(int item);
-GLUTAPI void GLUTAPIENTRY glutAttachMenu(int button);
-GLUTAPI void GLUTAPIENTRY glutDetachMenu(int button);
-
-/* GLUT window callback sub-API. */
-GLUTAPI void GLUTAPIENTRY glutDisplayFunc(void (GLUTCALLBACK *func)(void));
-GLUTAPI void GLUTAPIENTRY glutReshapeFunc(void (GLUTCALLBACK *func)(int width, int height));
-GLUTAPI void GLUTAPIENTRY glutKeyboardFunc(void (GLUTCALLBACK *func)(unsigned char key, int x, int y));
-GLUTAPI void GLUTAPIENTRY glutMouseFunc(void (GLUTCALLBACK *func)(int button, int state, int x, int y));
-GLUTAPI void GLUTAPIENTRY glutMotionFunc(void (GLUTCALLBACK *func)(int x, int y));
-GLUTAPI void GLUTAPIENTRY glutPassiveMotionFunc(void (GLUTCALLBACK *func)(int x, int y));
-GLUTAPI void GLUTAPIENTRY glutEntryFunc(void (GLUTCALLBACK *func)(int state));
-GLUTAPI void GLUTAPIENTRY glutVisibilityFunc(void (GLUTCALLBACK *func)(int state));
-GLUTAPI void GLUTAPIENTRY glutIdleFunc(void (GLUTCALLBACK *func)(void));
-GLUTAPI void GLUTAPIENTRY glutTimerFunc(unsigned int millis, void (GLUTCALLBACK *func)(int value), int value);
-GLUTAPI void GLUTAPIENTRY glutMenuStateFunc(void (GLUTCALLBACK *func)(int state));
-#if (GLUT_API_VERSION >= 2)
-GLUTAPI void GLUTAPIENTRY glutSpecialFunc(void (GLUTCALLBACK *func)(int key, int x, int y));
-GLUTAPI void GLUTAPIENTRY glutSpaceballMotionFunc(void (GLUTCALLBACK *func)(int x, int y, int z));
-GLUTAPI void GLUTAPIENTRY glutSpaceballRotateFunc(void (GLUTCALLBACK *func)(int x, int y, int z));
-GLUTAPI void GLUTAPIENTRY glutSpaceballButtonFunc(void (GLUTCALLBACK *func)(int button, int state));
-GLUTAPI void GLUTAPIENTRY glutButtonBoxFunc(void (GLUTCALLBACK *func)(int button, int state));
-GLUTAPI void GLUTAPIENTRY glutDialsFunc(void (GLUTCALLBACK *func)(int dial, int value));
-GLUTAPI void GLUTAPIENTRY glutTabletMotionFunc(void (GLUTCALLBACK *func)(int x, int y));
-GLUTAPI void GLUTAPIENTRY glutTabletButtonFunc(void (GLUTCALLBACK *func)(int button, int state, int x, int y));
-#if (GLUT_API_VERSION >= 3)
-GLUTAPI void GLUTAPIENTRY glutMenuStatusFunc(void (GLUTCALLBACK *func)(int status, int x, int y));
-GLUTAPI void GLUTAPIENTRY glutOverlayDisplayFunc(void (GLUTCALLBACK *func)(void));
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-GLUTAPI void GLUTAPIENTRY glutWindowStatusFunc(void (GLUTCALLBACK *func)(int state));
-#endif
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
-GLUTAPI void GLUTAPIENTRY glutKeyboardUpFunc(void (GLUTCALLBACK *func)(unsigned char key, int x, int y));
-GLUTAPI void GLUTAPIENTRY glutSpecialUpFunc(void (GLUTCALLBACK *func)(int key, int x, int y));
-GLUTAPI void GLUTAPIENTRY glutJoystickFunc(void (GLUTCALLBACK *func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);
-#endif
-#endif
-#endif
-
-/* GLUT color index sub-API. */
-GLUTAPI void GLUTAPIENTRY glutSetColor(int ndx, GLfloat red, GLfloat green, GLfloat blue);
-GLUTAPI GLfloat GLUTAPIENTRY glutGetColor(int ndx, int component);
-GLUTAPI void GLUTAPIENTRY glutCopyColormap(int win);
-
-/* GLUT state retrieval sub-API. */
-GLUTAPI int GLUTAPIENTRY glutGet(GLenum type);
-GLUTAPI int GLUTAPIENTRY glutDeviceGet(GLenum type);
-#if (GLUT_API_VERSION >= 2)
-/* GLUT extension support sub-API */
-GLUTAPI int GLUTAPIENTRY glutExtensionSupported(const char *name);
-#endif
-#if (GLUT_API_VERSION >= 3)
-GLUTAPI int GLUTAPIENTRY glutGetModifiers(void);
-GLUTAPI int GLUTAPIENTRY glutLayerGet(GLenum type);
-#endif
-#if (GLUT_API_VERSION >= 5)
-typedef void (*GLUTproc)();
-GLUTAPI GLUTproc GLUTAPIENTRY glutGetProcAddress(const char *procName);
-#endif
-
-/* GLUT font sub-API */
-GLUTAPI void GLUTAPIENTRY glutBitmapCharacter(void *font, int character);
-GLUTAPI int GLUTAPIENTRY glutBitmapWidth(void *font, int character);
-GLUTAPI void GLUTAPIENTRY glutStrokeCharacter(void *font, int character);
-GLUTAPI int GLUTAPIENTRY glutStrokeWidth(void *font, int character);
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-GLUTAPI int GLUTAPIENTRY glutBitmapLength(void *font, const unsigned char *string);
-GLUTAPI int GLUTAPIENTRY glutStrokeLength(void *font, const unsigned char *string);
-#endif
-
-/* GLUT pre-built models sub-API */
-GLUTAPI void GLUTAPIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks);
-GLUTAPI void GLUTAPIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks);
-GLUTAPI void GLUTAPIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-GLUTAPI void GLUTAPIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-GLUTAPI void GLUTAPIENTRY glutWireCube(GLdouble size);
-GLUTAPI void GLUTAPIENTRY glutSolidCube(GLdouble size);
-GLUTAPI void GLUTAPIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-GLUTAPI void GLUTAPIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-GLUTAPI void GLUTAPIENTRY glutWireDodecahedron(void);
-GLUTAPI void GLUTAPIENTRY glutSolidDodecahedron(void);
-GLUTAPI void GLUTAPIENTRY glutWireTeapot(GLdouble size);
-GLUTAPI void GLUTAPIENTRY glutSolidTeapot(GLdouble size);
-GLUTAPI void GLUTAPIENTRY glutWireOctahedron(void);
-GLUTAPI void GLUTAPIENTRY glutSolidOctahedron(void);
-GLUTAPI void GLUTAPIENTRY glutWireTetrahedron(void);
-GLUTAPI void GLUTAPIENTRY glutSolidTetrahedron(void);
-GLUTAPI void GLUTAPIENTRY glutWireIcosahedron(void);
-GLUTAPI void GLUTAPIENTRY glutSolidIcosahedron(void);
-
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
-/* GLUT video resize sub-API. */
-GLUTAPI int GLUTAPIENTRY glutVideoResizeGet(GLenum param);
-GLUTAPI void GLUTAPIENTRY glutSetupVideoResizing(void);
-GLUTAPI void GLUTAPIENTRY glutStopVideoResizing(void);
-GLUTAPI void GLUTAPIENTRY glutVideoResize(int x, int y, int width, int height);
-GLUTAPI void GLUTAPIENTRY glutVideoPan(int x, int y, int width, int height);
-
-/* GLUT debugging sub-API. */
-GLUTAPI void GLUTAPIENTRY glutReportErrors(void);
-#endif
-
-#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
-/* GLUT device control sub-API. */
-/* glutSetKeyRepeat modes. */
-#define GLUT_KEY_REPEAT_OFF		0
-#define GLUT_KEY_REPEAT_ON		1
-#define GLUT_KEY_REPEAT_DEFAULT		2
-
-/* Joystick button masks. */
-#define GLUT_JOYSTICK_BUTTON_A		1
-#define GLUT_JOYSTICK_BUTTON_B		2
-#define GLUT_JOYSTICK_BUTTON_C		4
-#define GLUT_JOYSTICK_BUTTON_D		8
-
-GLUTAPI void GLUTAPIENTRY glutIgnoreKeyRepeat(int ignore);
-GLUTAPI void GLUTAPIENTRY glutSetKeyRepeat(int repeatMode);
-GLUTAPI void GLUTAPIENTRY glutForceJoystickFunc(void);
-
-/* GLUT game mode sub-API. */
-/* glutGameModeGet. */
-#define GLUT_GAME_MODE_ACTIVE           0
-#define GLUT_GAME_MODE_POSSIBLE         1
-#define GLUT_GAME_MODE_WIDTH            2
-#define GLUT_GAME_MODE_HEIGHT           3
-#define GLUT_GAME_MODE_PIXEL_DEPTH      4
-#define GLUT_GAME_MODE_REFRESH_RATE     5
-#define GLUT_GAME_MODE_DISPLAY_CHANGED  6
-
-GLUTAPI void GLUTAPIENTRY glutGameModeString(const char *string);
-GLUTAPI int GLUTAPIENTRY glutEnterGameMode(void);
-GLUTAPI void GLUTAPIENTRY glutLeaveGameMode(void);
-GLUTAPI int GLUTAPIENTRY glutGameModeGet(GLenum mode);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif                  /* __glut_h__ */
diff --git a/nx-X11/extras/Mesa/include/GL/glut_h.dja b/nx-X11/extras/Mesa/include/GL/glut_h.dja
deleted file mode 100644
index e76dcb985..000000000
--- a/nx-X11/extras/Mesa/include/GL/glut_h.dja
+++ /dev/null
@@ -1,340 +0,0 @@
-
-/*
- * Mesa 3-D graphics library
- * Version:  3.1
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-/*
- * This header file is based on the REAL glut.h by Mark J. Kilgard.
- *
- * The DJGPP/ALLEGRO (DJA) GLUT implementation was written by
- * Bernhard Tschirren (bernie-t@geocities.com) for the sole purpose
- * of compiling all the sample programs (which use GLUT). Therefore,
- * is NOT AT ALL a complete version of GLUT!
- */
-
-
-#ifndef __AGLUT_H__
-#define __AGLUT_H__
-
-#include <GL/gl.h>
-#include <GL/glu.h>
-
-#define GLUTCALLBACK
-#define APIENTRY
-#define GLUTAPI             extern
-
-#define GLUT_RGB			0
-#define GLUT_RGBA			GLUT_RGB
-#define GLUT_INDEX			1
-#define GLUT_SINGLE			0
-#define GLUT_DOUBLE			2
-#define GLUT_ACCUM			4
-#define GLUT_ALPHA			8
-#define GLUT_DEPTH			16
-#define GLUT_STENCIL        32
-
-/* Mouse buttons. */
-#define GLUT_LEFT_BUTTON    0
-#define GLUT_MIDDLE_BUTTON  1
-#define GLUT_RIGHT_BUTTON   2
-
-/* Mouse button  state. */
-#define GLUT_DOWN			0
-#define GLUT_UP				1
-
-/* function keys */
-#define GLUT_KEY_F1			1
-#define GLUT_KEY_F2			2
-#define GLUT_KEY_F3			3
-#define GLUT_KEY_F4			4
-#define GLUT_KEY_F5			5
-#define GLUT_KEY_F6			6
-#define GLUT_KEY_F7			7
-#define GLUT_KEY_F8			8
-#define GLUT_KEY_F9			9
-#define GLUT_KEY_F10        10
-#define GLUT_KEY_F11        11
-#define GLUT_KEY_F12        12
-
-/* directional keys */
-#define GLUT_KEY_LEFT       100
-#define GLUT_KEY_UP			101
-#define GLUT_KEY_RIGHT      102
-#define GLUT_KEY_DOWN       103
-#define GLUT_KEY_PAGE_UP    104
-#define GLUT_KEY_PAGE_DOWN  105
-#define GLUT_KEY_HOME       106
-#define GLUT_KEY_END        107
-#define GLUT_KEY_INSERT     108
-
-/* Entry/exit  state. */
-#define GLUT_LEFT			0
-#define GLUT_ENTERED        1
-
-/* Visibility  state. */
-#define GLUT_NOT_VISIBLE    0
-#define GLUT_VISIBLE        1
-
-/* Color index component selection values. */
-#define GLUT_RED			0
-#define GLUT_GREEN			1
-#define GLUT_BLUE			2
-
-/* Layers for use. */
-#define GLUT_NORMAL			0
-#define GLUT_OVERLAY        1
-
-/* Stroke font constants (use these in GLUT program). */
-#define GLUT_STROKE_ROMAN           ((void*)0)
-#define GLUT_STROKE_MONO_ROMAN		((void*)1)
-
-/* Bitmap font constants (use these in GLUT program). */
-#define GLUT_BITMAP_9_BY_15         ((void*)2)
-#define GLUT_BITMAP_8_BY_13         ((void*)3)
-#define GLUT_BITMAP_TIMES_ROMAN_10	((void*)4)
-#define GLUT_BITMAP_TIMES_ROMAN_24	((void*)5)
-#define GLUT_BITMAP_HELVETICA_10	((void*)6)
-#define GLUT_BITMAP_HELVETICA_12	((void*)7)
-#define GLUT_BITMAP_HELVETICA_18    ((void*)8)
-
-/* glutGet parameters. */
-#define GLUT_WINDOW_X                   100
-#define GLUT_WINDOW_Y                   101
-#define GLUT_WINDOW_WIDTH               102
-#define GLUT_WINDOW_HEIGHT              103
-#define GLUT_WINDOW_BUFFER_SIZE         104
-#define GLUT_WINDOW_STENCIL_SIZE        105
-#define GLUT_WINDOW_DEPTH_SIZE          106
-#define GLUT_WINDOW_RED_SIZE            107
-#define GLUT_WINDOW_GREEN_SIZE          108
-#define GLUT_WINDOW_BLUE_SIZE           109
-#define GLUT_WINDOW_ALPHA_SIZE          110
-#define GLUT_WINDOW_ACCUM_RED_SIZE      111
-#define GLUT_WINDOW_ACCUM_GREEN_SIZE	112
-#define GLUT_WINDOW_ACCUM_BLUE_SIZE     113
-#define GLUT_WINDOW_ACCUM_ALPHA_SIZE	114
-#define GLUT_WINDOW_DOUBLEBUFFER        115
-#define GLUT_WINDOW_RGBA                116
-#define GLUT_WINDOW_PARENT              117
-#define GLUT_WINDOW_NUM_CHILDREN        118
-#define GLUT_WINDOW_COLORMAP_SIZE       119
-#define GLUT_WINDOW_NUM_SAMPLES         120
-#define GLUT_WINDOW_STEREO              121
-#define GLUT_WINDOW_CURSOR              122
-#define GLUT_SCREEN_WIDTH               200
-#define GLUT_SCREEN_HEIGHT              201
-#define GLUT_SCREEN_WIDTH_MM            202
-#define GLUT_SCREEN_HEIGHT_MM           203
-#define GLUT_MENU_NUM_ITEMS             300
-#define GLUT_DISPLAY_MODE_POSSIBLE      400
-#define GLUT_INIT_WINDOW_X              500
-#define GLUT_INIT_WINDOW_Y              501
-#define GLUT_INIT_WINDOW_WIDTH          502
-#define GLUT_INIT_WINDOW_HEIGHT         503
-#define GLUT_INIT_DISPLAY_MODE          504
-#define GLUT_ELAPSED_TIME               700
-#define GLUT_WINDOW_FORMAT_ID           123
-
-/* glutDeviceGet parameters. */
-#define GLUT_HAS_KEYBOARD               600
-#define GLUT_HAS_MOUSE                  601
-#define GLUT_HAS_SPACEBALL              602
-#define GLUT_HAS_DIAL_AND_BUTTON_BOX	603
-#define GLUT_HAS_TABLET                 604
-#define GLUT_NUM_MOUSE_BUTTONS          605
-#define GLUT_NUM_SPACEBALL_BUTTONS      606
-#define GLUT_NUM_BUTTON_BOX_BUTTONS     607
-#define GLUT_NUM_DIALS                  608
-#define GLUT_NUM_TABLET_BUTTONS         609
-#define GLUT_DEVICE_IGNORE_KEY_REPEAT   610
-#define GLUT_DEVICE_KEY_REPEAT          611
-#define GLUT_HAS_JOYSTICK               612
-#define GLUT_OWNS_JOYSTICK              613
-#define GLUT_JOYSTICK_BUTTONS           614
-#define GLUT_JOYSTICK_AXES              615
-#define GLUT_JOYSTICK_POLL_RATE         616
-
-/* glutLayerGet parameters. */
-#define GLUT_OVERLAY_POSSIBLE           800
-#define GLUT_LAYER_IN_USE               801
-#define GLUT_HAS_OVERLAY                802
-#define GLUT_TRANSPARENT_INDEX          803
-#define GLUT_NORMAL_DAMAGED             804
-#define GLUT_OVERLAY_DAMAGED            805
-
-/* glutVideoResizeGet parameters. */
-#define GLUT_VIDEO_RESIZE_POSSIBLE      900
-#define GLUT_VIDEO_RESIZE_IN_USE        901
-#define GLUT_VIDEO_RESIZE_X_DELTA       902
-#define GLUT_VIDEO_RESIZE_Y_DELTA       903
-#define GLUT_VIDEO_RESIZE_WIDTH_DELTA	904
-#define GLUT_VIDEO_RESIZE_HEIGHT_DELTA	905
-#define GLUT_VIDEO_RESIZE_X             906
-#define GLUT_VIDEO_RESIZE_Y             907
-#define GLUT_VIDEO_RESIZE_WIDTH         908
-#define GLUT_VIDEO_RESIZE_HEIGHT        909
-
-/* glutUseLayer parameters. */
-#define GLUT_NORMAL                     0
-#define GLUT_OVERLAY                    1
-
-/* glutGetModifiers return mask. */
-#define GLUT_ACTIVE_SHIFT               1
-#define GLUT_ACTIVE_CTRL                2
-#define GLUT_ACTIVE_ALT                 4
-
-/* glutSetCursor parameters. */
-/* Basic arrows. */
-#define GLUT_CURSOR_RIGHT_ARROW         0
-#define GLUT_CURSOR_LEFT_ARROW          1
-/* Symbolic cursor shapes. */
-#define GLUT_CURSOR_INFO                2
-#define GLUT_CURSOR_DESTROY             3
-#define GLUT_CURSOR_HELP                4
-#define GLUT_CURSOR_CYCLE               5
-#define GLUT_CURSOR_SPRAY               6
-#define GLUT_CURSOR_WAIT                7
-#define GLUT_CURSOR_TEXT                8
-#define GLUT_CURSOR_CROSSHAIR           9
-/* Directional cursors. */
-#define GLUT_CURSOR_UP_DOWN             10
-#define GLUT_CURSOR_LEFT_RIGHT          11
-/* Sizing cursors. */
-#define GLUT_CURSOR_TOP_SIDE            12
-#define GLUT_CURSOR_BOTTOM_SIDE         13
-#define GLUT_CURSOR_LEFT_SIDE           14
-#define GLUT_CURSOR_RIGHT_SIDE          15
-#define GLUT_CURSOR_TOP_LEFT_CORNER     16
-#define GLUT_CURSOR_TOP_RIGHT_CORNER	17
-#define GLUT_CURSOR_BOTTOM_RIGHT_CORNER	18
-#define GLUT_CURSOR_BOTTOM_LEFT_CORNER	19
-/* Inherit from parent window. */
-#define GLUT_CURSOR_INHERIT             100
-/* Blank cursor. */
-#define GLUT_CURSOR_NONE                101
-/* Fullscreen crosshair (if available). */
-#define GLUT_CURSOR_FULL_CROSSHAIR      102
-
-/* GLUT initialization sub-API. */
-GLUTAPI void APIENTRY glutInit(int *argcp, char **argv);
-GLUTAPI void APIENTRY glutInitDisplayMode(unsigned int mode);
-GLUTAPI void APIENTRY glutInitWindowPosition(int x, int y);
-GLUTAPI void APIENTRY glutInitWindowSize(int width, int height);
-GLUTAPI void APIENTRY glutMainLoop(void);
-
-/* GLUT window sub-API. */
-GLUTAPI int APIENTRY glutCreateWindow(const char *title);
-GLUTAPI int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height);
-GLUTAPI void APIENTRY glutDestroyWindow(int win);
-GLUTAPI void APIENTRY glutPostRedisplay(void);
-GLUTAPI void APIENTRY glutSwapBuffers(void);
-GLUTAPI int APIENTRY glutGetWindow(void);
-GLUTAPI void APIENTRY glutSetWindow(int win);
-GLUTAPI void APIENTRY glutSetWindowTitle(const char *title);
-GLUTAPI void APIENTRY glutSetIconTitle(const char *title);
-GLUTAPI void APIENTRY glutPositionWindow(int x, int y);
-GLUTAPI void APIENTRY glutReshapeWindow(int width, int height);
-GLUTAPI void APIENTRY glutPopWindow(void);
-GLUTAPI void APIENTRY glutPushWindow(void);
-GLUTAPI void APIENTRY glutIconifyWindow(void);
-GLUTAPI void APIENTRY glutShowWindow(void);
-GLUTAPI void APIENTRY glutHideWindow(void);
-
-/* GLUT overlay sub-API. */
-GLUTAPI void APIENTRY glutEstablishOverlay(void);
-GLUTAPI void APIENTRY glutRemoveOverlay(void);
-GLUTAPI void APIENTRY glutUseLayer(GLenum layer);
-GLUTAPI void APIENTRY glutPostOverlayRedisplay(void);
-GLUTAPI void APIENTRY glutShowOverlay(void);
-GLUTAPI void APIENTRY glutHideOverlay(void);
-
-/* GLUT menu sub-API. */
-GLUTAPI int APIENTRY glutCreateMenu(void (GLUTCALLBACK *)(int));
-GLUTAPI void APIENTRY glutDestroyMenu(int menu);
-GLUTAPI int APIENTRY glutGetMenu(void);
-GLUTAPI void APIENTRY glutSetMenu(int menu);
-GLUTAPI void APIENTRY glutAddMenuEntry(const char *label, int value);
-GLUTAPI void APIENTRY glutAddSubMenu(const char *label, int submenu);
-GLUTAPI void APIENTRY glutChangeToMenuEntry(int item, const char *label, int value);
-GLUTAPI void APIENTRY glutChangeToSubMenu(int item, const char *label, int submenu);
-GLUTAPI void APIENTRY glutRemoveMenuItem(int item);
-GLUTAPI void APIENTRY glutAttachMenu(int button);
-GLUTAPI void APIENTRY glutDetachMenu(int button);
-
-/* GLUT window callback sub-API. */
-GLUTAPI void APIENTRY glutDisplayFunc(void (GLUTCALLBACK * func)(void));
-GLUTAPI void APIENTRY glutReshapeFunc(void (GLUTCALLBACK * func)(int width, int height));
-GLUTAPI void APIENTRY glutKeyboardFunc(void (GLUTCALLBACK * func)(unsigned char key, int x, int y));
-GLUTAPI void APIENTRY glutMouseFunc(void (GLUTCALLBACK * func)(int button, int state, int x, int y));
-GLUTAPI void APIENTRY glutMotionFunc(void (GLUTCALLBACK * func)(int x, int y));
-GLUTAPI void APIENTRY glutPassiveMotionFunc(void (GLUTCALLBACK * func)(int x, int y));
-GLUTAPI void APIENTRY glutEntryFunc(void (GLUTCALLBACK * func)(int state));
-GLUTAPI void APIENTRY glutVisibilityFunc(void (GLUTCALLBACK * func)(int state));
-GLUTAPI void APIENTRY glutIdleFunc(void (GLUTCALLBACK * func)(void));
-GLUTAPI void APIENTRY glutTimerFunc(unsigned int millis, void (GLUTCALLBACK * func)(int value), int value);
-GLUTAPI void APIENTRY glutMenuStateFunc(void (GLUTCALLBACK * func)(int state));
-GLUTAPI void APIENTRY glutSpecialFunc(void (GLUTCALLBACK * func)(int key, int x, int y));
-GLUTAPI void APIENTRY glutSpaceballMotionFunc(void (GLUTCALLBACK * func)(int x, int y, int z));
-GLUTAPI void APIENTRY glutSpaceballRotateFunc(void (GLUTCALLBACK * func)(int x, int y, int z));
-GLUTAPI void APIENTRY glutSpaceballButtonFunc(void (GLUTCALLBACK * func)(int button, int state));
-GLUTAPI void APIENTRY glutButtonBoxFunc(void (GLUTCALLBACK * func)(int button, int state));
-GLUTAPI void APIENTRY glutDialsFunc(void (GLUTCALLBACK * func)(int dial, int value));
-GLUTAPI void APIENTRY glutTabletMotionFunc(void (GLUTCALLBACK * func)(int x, int y));
-GLUTAPI void APIENTRY glutTabletButtonFunc(void (GLUTCALLBACK * func)(int button, int state, int x, int y));
-GLUTAPI void APIENTRY glutMenuStatusFunc(void (GLUTCALLBACK * func)(int status, int x, int y));
-GLUTAPI void APIENTRY glutOverlayDisplayFunc(void (GLUTCALLBACK * func)(void));
-GLUTAPI void APIENTRY glutWindowStatusFunc(void (GLUTCALLBACK * func)(int state));
-
-/* GLUT color index sub-API. */
-GLUTAPI void APIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue);
-GLUTAPI GLfloat APIENTRY glutGetColor(int ndx, int component);
-GLUTAPI void APIENTRY glutCopyColormap(int win);
-
-/* GLUT state retrieval sub-API. */
-GLUTAPI int APIENTRY glutGet(GLenum type);
-GLUTAPI int APIENTRY glutDeviceGet(GLenum type);
-
-/* GLUT font sub-API */
-GLUTAPI void APIENTRY glutBitmapCharacter(void *font, int character);
-GLUTAPI int APIENTRY glutBitmapWidth(void *font, int character);
-GLUTAPI void APIENTRY glutStrokeCharacter(void *font, int character);
-GLUTAPI int APIENTRY glutStrokeWidth(void *font, int character);
-
-/* GLUT pre-built models sub-API */
-GLUTAPI void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks);
-GLUTAPI void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks);
-GLUTAPI void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-GLUTAPI void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-GLUTAPI void APIENTRY glutWireCube(GLdouble size);
-GLUTAPI void APIENTRY glutSolidCube(GLdouble size);
-GLUTAPI void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-GLUTAPI void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-GLUTAPI void APIENTRY glutWireDodecahedron(void);
-GLUTAPI void APIENTRY glutSolidDodecahedron(void);
-GLUTAPI void APIENTRY glutWireTeapot(GLdouble size);
-GLUTAPI void APIENTRY glutSolidTeapot(GLdouble size);
-GLUTAPI void APIENTRY glutWireOctahedron(void);
-GLUTAPI void APIENTRY glutSolidOctahedron(void);
-GLUTAPI void APIENTRY glutWireTetrahedron(void);
-GLUTAPI void APIENTRY glutSolidTetrahedron(void);
-GLUTAPI void APIENTRY glutWireIcosahedron(void);
-GLUTAPI void APIENTRY glutSolidIcosahedron(void);
-
-#endif /* __AGLUT_H__ */
diff --git a/nx-X11/extras/Mesa/include/GL/glutf90.h b/nx-X11/extras/Mesa/include/GL/glutf90.h
deleted file mode 100644
index 7ba3e19ef..000000000
--- a/nx-X11/extras/Mesa/include/GL/glutf90.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef __glutf90_h__
-#define __glutf90_h__
-
-/* Copyright (c) Mark J. Kilgard & Willam F. Mitchell, 1998. */
-
-/* This program is freely distributable without licensing fees 
-   and is provided without guarantee or warrantee expressed or 
-   implied. This program is -not- in the public domain. */
-
-/* This header provides the binding interface for William Mitchell's
-   f90gl Fortran 90 GLUT binding.  Other GLUT language bindings
-   can and should use this interace. */
-
-/* I appreciate the guidance from William Mitchell
-   (mitchell@cam.nist.gov) in developing this friend interface
-   for use by the f90gl package.  See ../../README.fortran */
-
-#include <GL/glut.h>
-
-/* Which callback enumerants for the __glutSetFCB/__glutGetFCB routines. */
-/* NOTE These values are part of a binary interface for the f90gl Fortran
-   90 binding and so must NOT changes (additions are allowed). */
-
-/* GLUTwindow callbacks. */
-#define GLUT_FCB_DISPLAY         0    /* GLUTdisplayFCB */
-#define GLUT_FCB_RESHAPE         1    /* GLUTreshapeFCB */
-#define GLUT_FCB_MOUSE           2    /* GLUTmouseFCB */
-#define GLUT_FCB_MOTION          3    /* GLUTmotionFCB */
-#define GLUT_FCB_PASSIVE         4    /* GLUTpassiveFCB */
-#define GLUT_FCB_ENTRY           5    /* GLUTentryFCB */
-#define GLUT_FCB_KEYBOARD        6    /* GLUTkeyboardFCB */
-#define GLUT_FCB_KEYBOARD_UP     7    /* GLUTkeyboardFCB */
-#define GLUT_FCB_WINDOW_STATUS   8    /* GLUTwindowStatusFCB */
-#define GLUT_FCB_VISIBILITY      9    /* GLUTvisibilityFCB */
-#define GLUT_FCB_SPECIAL         10   /* GLUTspecialFCB */
-#define GLUT_FCB_SPECIAL_UP      11   /* GLUTspecialFCB */
-#define GLUT_FCB_BUTTON_BOX      12   /* GLUTbuttonBoxFCB */
-#define GLUT_FCB_DIALS           13   /* GLUTdialsFCB */
-#define GLUT_FCB_SPACE_MOTION    14   /* GLUTspaceMotionFCB */
-#define GLUT_FCB_SPACE_ROTATE    15   /* GLUTspaceRotateFCB */
-#define GLUT_FCB_SPACE_BUTTON    16   /* GLUTspaceButtonFCB */
-#define GLUT_FCB_TABLET_MOTION   17   /* GLUTtabletMotionFCB */
-#define GLUT_FCB_TABLET_BUTTON   18   /* GLUTtabletButtonFCB */
-#define GLUT_FCB_JOYSTICK        19   /* GLUTjoystickFCB */
-/* Non-GLUTwindow callbacks. */
-#define GLUT_FCB_OVERLAY_DISPLAY 100  /* GLUTdisplayFCB */
-#define GLUT_FCB_SELECT          101  /* GLUTselectFCB */
-#define GLUT_FCB_TIMER           102  /* GLUTtimerFCB */
-
-/* GLUT Fortran callback function types. */
-typedef void (GLUTCALLBACK *GLUTdisplayFCB) (void);
-typedef void (GLUTCALLBACK *GLUTreshapeFCB) (int *, int *);
-/* NOTE the pressed key is int, not unsigned char for Fortran! */
-typedef void (GLUTCALLBACK *GLUTkeyboardFCB) (int *, int *, int *);
-typedef void (GLUTCALLBACK *GLUTmouseFCB) (int *, int *, int *, int *);
-typedef void (GLUTCALLBACK *GLUTmotionFCB) (int *, int *);
-typedef void (GLUTCALLBACK *GLUTpassiveFCB) (int *, int *);
-typedef void (GLUTCALLBACK *GLUTentryFCB) (int *);
-typedef void (GLUTCALLBACK *GLUTwindowStatusFCB) (int *);
-typedef void (GLUTCALLBACK *GLUTvisibilityFCB) (int *);
-typedef void (GLUTCALLBACK *GLUTspecialFCB) (int *, int *, int *);
-typedef void (GLUTCALLBACK *GLUTbuttonBoxFCB) (int *, int *);
-typedef void (GLUTCALLBACK *GLUTdialsFCB) (int *, int *);
-typedef void (GLUTCALLBACK *GLUTspaceMotionFCB) (int *, int *, int *);
-typedef void (GLUTCALLBACK *GLUTspaceRotateFCB) (int *, int *, int *);
-typedef void (GLUTCALLBACK *GLUTspaceButtonFCB) (int *, int *);
-typedef void (GLUTCALLBACK *GLUTtabletMotionFCB) (int *, int *);
-typedef void (GLUTCALLBACK *GLUTtabletButtonFCB) (int *, int *, int *, int *);
-typedef void (GLUTCALLBACK *GLUTjoystickFCB) (unsigned int *buttonMask, int *x, int *y, int *z);
-
-typedef void (GLUTCALLBACK *GLUTselectFCB) (int *);
-typedef void (GLUTCALLBACK *GLUTtimerFCB) (int *);
-typedef void (GLUTCALLBACK *GLUTmenuStateFCB) (int *);  /* DEPRICATED. */
-typedef void (GLUTCALLBACK *GLUTmenuStatusFCB) (int *, int *, int *);
-typedef void (GLUTCALLBACK *GLUTidleFCB) (void);
-
-/* Functions that set and return Fortran callback functions. */
-GLUTAPI void* APIENTRY __glutGetFCB(int which);
-GLUTAPI void APIENTRY __glutSetFCB(int which, void *func);
-
-#endif  /* __glutf90_h__ */
diff --git a/nx-X11/extras/Mesa/include/GL/glx.h b/nx-X11/extras/Mesa/include/GL/glx.h
deleted file mode 100644
index ab0467c18..000000000
--- a/nx-X11/extras/Mesa/include/GL/glx.h
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- * 
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifndef GLX_H
-#define GLX_H
-
-
-#ifdef __VMS
-#include <GL/vms_x_fix.h>
-# ifdef __cplusplus
-/* VMS Xlib.h gives problems with C++.
- * this avoids a bunch of trivial warnings */
-#pragma message disable nosimpint
-#endif
-#endif
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#ifdef __VMS
-# ifdef __cplusplus
-#pragma message enable nosimpint
-#endif
-#endif
-#include <GL/gl.h>
-
-
-#if defined(USE_MGL_NAMESPACE)
-#include "glx_mangle.h"
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define GLX_VERSION_1_1		1
-#define GLX_VERSION_1_2		1
-#define GLX_VERSION_1_3		1
-#define GLX_VERSION_1_4		1
-
-#define GLX_EXTENSION_NAME   "GLX"
-
-
-
-/*
- * Tokens for glXChooseVisual and glXGetConfig:
- */
-#define GLX_USE_GL		1
-#define GLX_BUFFER_SIZE		2
-#define GLX_LEVEL		3
-#define GLX_RGBA		4
-#define GLX_DOUBLEBUFFER	5
-#define GLX_STEREO		6
-#define GLX_AUX_BUFFERS		7
-#define GLX_RED_SIZE		8
-#define GLX_GREEN_SIZE		9
-#define GLX_BLUE_SIZE		10
-#define GLX_ALPHA_SIZE		11
-#define GLX_DEPTH_SIZE		12
-#define GLX_STENCIL_SIZE	13
-#define GLX_ACCUM_RED_SIZE	14
-#define GLX_ACCUM_GREEN_SIZE	15
-#define GLX_ACCUM_BLUE_SIZE	16
-#define GLX_ACCUM_ALPHA_SIZE	17
-
-
-/*
- * Error codes returned by glXGetConfig:
- */
-#define GLX_BAD_SCREEN		1
-#define GLX_BAD_ATTRIBUTE	2
-#define GLX_NO_EXTENSION	3
-#define GLX_BAD_VISUAL		4
-#define GLX_BAD_CONTEXT		5
-#define GLX_BAD_VALUE       	6
-#define GLX_BAD_ENUM		7
-
-
-/*
- * GLX 1.1 and later:
- */
-#define GLX_VENDOR		1
-#define GLX_VERSION		2
-#define GLX_EXTENSIONS 		3
-
-
-/*
- * GLX 1.3 and later:
- */
-#define GLX_CONFIG_CAVEAT		0x20
-#define GLX_DONT_CARE			0xFFFFFFFF
-#define GLX_X_VISUAL_TYPE		0x22
-#define GLX_TRANSPARENT_TYPE		0x23
-#define GLX_TRANSPARENT_INDEX_VALUE	0x24
-#define GLX_TRANSPARENT_RED_VALUE	0x25
-#define GLX_TRANSPARENT_GREEN_VALUE	0x26
-#define GLX_TRANSPARENT_BLUE_VALUE	0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE	0x28
-#define GLX_WINDOW_BIT			0x00000001
-#define GLX_PIXMAP_BIT			0x00000002
-#define GLX_PBUFFER_BIT			0x00000004
-#define GLX_AUX_BUFFERS_BIT		0x00000010
-#define GLX_FRONT_LEFT_BUFFER_BIT	0x00000001
-#define GLX_FRONT_RIGHT_BUFFER_BIT	0x00000002
-#define GLX_BACK_LEFT_BUFFER_BIT	0x00000004
-#define GLX_BACK_RIGHT_BUFFER_BIT	0x00000008
-#define GLX_DEPTH_BUFFER_BIT		0x00000020
-#define GLX_STENCIL_BUFFER_BIT		0x00000040
-#define GLX_ACCUM_BUFFER_BIT		0x00000080
-#define GLX_NONE			0x8000
-#define GLX_SLOW_CONFIG			0x8001
-#define GLX_TRUE_COLOR			0x8002
-#define GLX_DIRECT_COLOR		0x8003
-#define GLX_PSEUDO_COLOR		0x8004
-#define GLX_STATIC_COLOR		0x8005
-#define GLX_GRAY_SCALE			0x8006
-#define GLX_STATIC_GRAY			0x8007
-#define GLX_TRANSPARENT_RGB		0x8008
-#define GLX_TRANSPARENT_INDEX		0x8009
-#define GLX_VISUAL_ID			0x800B
-#define GLX_SCREEN			0x800C
-#define GLX_NON_CONFORMANT_CONFIG	0x800D
-#define GLX_DRAWABLE_TYPE		0x8010
-#define GLX_RENDER_TYPE			0x8011
-#define GLX_X_RENDERABLE		0x8012
-#define GLX_FBCONFIG_ID			0x8013
-#define GLX_RGBA_TYPE			0x8014
-#define GLX_COLOR_INDEX_TYPE		0x8015
-#define GLX_MAX_PBUFFER_WIDTH		0x8016
-#define GLX_MAX_PBUFFER_HEIGHT		0x8017
-#define GLX_MAX_PBUFFER_PIXELS		0x8018
-#define GLX_PRESERVED_CONTENTS		0x801B
-#define GLX_LARGEST_PBUFFER		0x801C
-#define GLX_WIDTH			0x801D
-#define GLX_HEIGHT			0x801E
-#define GLX_EVENT_MASK			0x801F
-#define GLX_DAMAGED			0x8020
-#define GLX_SAVED			0x8021
-#define GLX_WINDOW			0x8022
-#define GLX_PBUFFER			0x8023
-#define GLX_PBUFFER_HEIGHT              0x8040
-#define GLX_PBUFFER_WIDTH               0x8041
-#define GLX_RGBA_BIT			0x00000001
-#define GLX_COLOR_INDEX_BIT		0x00000002
-#define GLX_PBUFFER_CLOBBER_MASK	0x08000000
-
-
-/*
- * GLX 1.4 and later:
- */
-#define GLX_SAMPLE_BUFFERS              0x186a0 /*100000*/
-#define GLX_SAMPLES                     0x186a1 /*100001*/
-
-
-
-typedef struct __GLXcontextRec *GLXContext;
-typedef XID GLXPixmap;
-typedef XID GLXDrawable;
-/* GLX 1.3 and later */
-typedef struct __GLXFBConfigRec *GLXFBConfig;
-typedef XID GLXFBConfigID;
-typedef XID GLXContextID;
-typedef XID GLXWindow;
-typedef XID GLXPbuffer;
-
-
-
-extern XVisualInfo* glXChooseVisual( Display *dpy, int screen,
-				     int *attribList );
-
-extern GLXContext glXCreateContext( Display *dpy, XVisualInfo *vis,
-				    GLXContext shareList, Bool direct );
-
-extern void glXDestroyContext( Display *dpy, GLXContext ctx );
-
-extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
-			    GLXContext ctx);
-
-extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
-			    unsigned long mask );
-
-extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable );
-
-extern GLXPixmap glXCreateGLXPixmap( Display *dpy, XVisualInfo *visual,
-				     Pixmap pixmap );
-
-extern void glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap );
-
-extern Bool glXQueryExtension( Display *dpy, int *errorb, int *event );
-
-extern Bool glXQueryVersion( Display *dpy, int *maj, int *min );
-
-extern Bool glXIsDirect( Display *dpy, GLXContext ctx );
-
-extern int glXGetConfig( Display *dpy, XVisualInfo *visual,
-			 int attrib, int *value );
-
-extern GLXContext glXGetCurrentContext( void );
-
-extern GLXDrawable glXGetCurrentDrawable( void );
-
-extern void glXWaitGL( void );
-
-extern void glXWaitX( void );
-
-extern void glXUseXFont( Font font, int first, int count, int list );
-
-
-
-/* GLX 1.1 and later */
-extern const char *glXQueryExtensionsString( Display *dpy, int screen );
-
-extern const char *glXQueryServerString( Display *dpy, int screen, int name );
-
-extern const char *glXGetClientString( Display *dpy, int name );
-
-
-/* GLX 1.2 and later */
-extern Display *glXGetCurrentDisplay( void );
-
-
-/* GLX 1.3 and later */
-extern GLXFBConfig *glXChooseFBConfig( Display *dpy, int screen,
-                                       const int *attribList, int *nitems );
-
-extern int glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
-                                 int attribute, int *value );
-
-extern GLXFBConfig *glXGetFBConfigs( Display *dpy, int screen,
-                                     int *nelements );
-
-extern XVisualInfo *glXGetVisualFromFBConfig( Display *dpy,
-                                              GLXFBConfig config );
-
-extern GLXWindow glXCreateWindow( Display *dpy, GLXFBConfig config,
-                                  Window win, const int *attribList );
-
-extern void glXDestroyWindow( Display *dpy, GLXWindow window );
-
-extern GLXPixmap glXCreatePixmap( Display *dpy, GLXFBConfig config,
-                                  Pixmap pixmap, const int *attribList );
-
-extern void glXDestroyPixmap( Display *dpy, GLXPixmap pixmap );
-
-extern GLXPbuffer glXCreatePbuffer( Display *dpy, GLXFBConfig config,
-                                    const int *attribList );
-
-extern void glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );
-
-extern void glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
-                              unsigned int *value );
-
-extern GLXContext glXCreateNewContext( Display *dpy, GLXFBConfig config,
-                                       int renderType, GLXContext shareList,
-                                       Bool direct );
-
-extern Bool glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
-                                   GLXDrawable read, GLXContext ctx );
-
-extern GLXDrawable glXGetCurrentReadDrawable( void );
-
-extern int glXQueryContext( Display *dpy, GLXContext ctx, int attribute,
-                            int *value );
-
-extern void glXSelectEvent( Display *dpy, GLXDrawable drawable,
-                            unsigned long mask );
-
-extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
-                                 unsigned long *mask );
-
-
-/* GLX 1.4 and later */
-extern void (*glXGetProcAddress(const GLubyte *procname))( void );
-
-
-#ifndef GLX_GLXEXT_LEGACY
-
-#include <GL/glxext.h>
-
-#else
-
-
-/*
- * 28. GLX_EXT_visual_info extension
- */
-#ifndef GLX_EXT_visual_info
-#define GLX_EXT_visual_info		1
-
-#define GLX_X_VISUAL_TYPE_EXT		0x22
-#define GLX_TRANSPARENT_TYPE_EXT	0x23
-#define GLX_TRANSPARENT_INDEX_VALUE_EXT	0x24
-#define GLX_TRANSPARENT_RED_VALUE_EXT	0x25
-#define GLX_TRANSPARENT_GREEN_VALUE_EXT	0x26
-#define GLX_TRANSPARENT_BLUE_VALUE_EXT	0x27
-#define GLX_TRANSPARENT_ALPHA_VALUE_EXT	0x28
-#define GLX_TRUE_COLOR_EXT		0x8002
-#define GLX_DIRECT_COLOR_EXT		0x8003
-#define GLX_PSEUDO_COLOR_EXT		0x8004
-#define GLX_STATIC_COLOR_EXT		0x8005
-#define GLX_GRAY_SCALE_EXT		0x8006
-#define GLX_STATIC_GRAY_EXT		0x8007
-#define GLX_NONE_EXT			0x8000
-#define GLX_TRANSPARENT_RGB_EXT		0x8008
-#define GLX_TRANSPARENT_INDEX_EXT	0x8009
-
-#endif /* 28. GLX_EXT_visual_info extension */
-
-
-
-/*
- * 41. GLX_SGI_video_sync
- */
-#ifndef GLX_SGI_video_sync
-#define GLX_SGI_video_sync 1
-
-extern int glXGetVideoSyncSGI(unsigned int *count);
-extern int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count);
-
-#endif /* GLX_SGI_video_sync */
-
-
-
-/*
- * 42. GLX_EXT_visual_rating
- */
-#ifndef GLX_EXT_visual_rating
-#define GLX_EXT_visual_rating		1
-
-#define GLX_VISUAL_CAVEAT_EXT		0x20
-/*#define GLX_NONE_EXT			0x8000*/
-#define GLX_SLOW_VISUAL_EXT		0x8001
-#define GLX_NON_CONFORMANT_VISUAL_EXT	0x800D
-
-#endif /* GLX_EXT_visual_rating	*/
-
-
-
-/*
- * 47. GLX_EXT_import_context
- */
-#ifndef GLX_EXT_import_context
-#define GLX_EXT_import_context 1
-
-#define GLX_SHARE_CONTEXT_EXT		0x800A
-#define GLX_VISUAL_ID_EXT		0x800B
-#define GLX_SCREEN_EXT			0x800C
-
-extern void glXFreeContextEXT(Display *dpy, GLXContext context);
-
-extern GLXContextID glXGetContextIDEXT(const GLXContext context);
-
-extern Display *glXGetCurrentDisplayEXT(void);
-
-extern GLXContext glXImportContextEXT(Display *dpy, GLXContextID contextID);
-
-extern int glXQueryContextInfoEXT(Display *dpy, GLXContext context,
-                                  int attribute,int *value);
-
-#endif /* GLX_EXT_import_context */
-
-
-
-/*
- * 215. GLX_MESA_copy_sub_buffer
- */
-#ifndef GLX_MESA_copy_sub_buffer
-#define GLX_MESA_copy_sub_buffer 1
-
-extern void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable,
-                                  int x, int y, int width, int height );
-
-#endif
-
-
-
-/*
- * 216. GLX_MESA_pixmap_colormap
- */
-#ifndef GLX_MESA_pixmap_colormap
-#define GLX_MESA_pixmap_colormap 1
-
-extern GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual,
-                                         Pixmap pixmap, Colormap cmap );
-
-#endif /* GLX_MESA_pixmap_colormap */
-
-
-
-/*
- * 217. GLX_MESA_release_buffers
- */
-#ifndef GLX_MESA_release_buffers
-#define GLX_MESA_release_buffers 1
-
-extern Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d );
-
-#endif /* GLX_MESA_release_buffers */
-
-
-
-/*
- * 218. GLX_MESA_set_3dfx_mode
- */
-#ifndef GLX_MESA_set_3dfx_mode
-#define GLX_MESA_set_3dfx_mode 1
-
-#define GLX_3DFX_WINDOW_MODE_MESA       0x1
-#define GLX_3DFX_FULLSCREEN_MODE_MESA   0x2
-
-extern Bool glXSet3DfxModeMESA( int mode );
-
-#endif /* GLX_MESA_set_3dfx_mode */
-
-
-
-/*
- * ARB 2. GLX_ARB_get_proc_address
- */
-#ifndef GLX_ARB_get_proc_address
-#define GLX_ARB_get_proc_address 1
-
-extern void (*glXGetProcAddressARB(const GLubyte *procName))();
-
-#endif /* GLX_ARB_get_proc_address */
-
-
-
-#endif /* GLX_GLXEXT_LEGACY */
-
-
-/**
- ** The following aren't in glxext.h yet.
- **/
-
-
-/*
- * ???. GLX_NV_vertex_array_range
- */
-#ifndef GLX_NV_vertex_array_range
-#define GLX_NV_vertex_array_range
-
-extern void *glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
-extern void glXFreeMemoryNV(GLvoid *pointer);
-typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
-typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
-
-#endif /* GLX_NV_vertex_array_range */
-
-
-
-/*
- * ???. GLX_MESA_agp_offset
- */ 
-#ifndef GLX_MESA_agp_offset
-#define GLX_MESA_agp_offset 1
-
-extern GLuint glXGetAGPOffsetMESA(const GLvoid *pointer);
-typedef GLuint (* PFNGLXGETAGPOFFSETMESAPROC) (const GLvoid *pointer);
-
-#endif /* GLX_MESA_agp_offset */
-
-
-/*
- * ???. GLX_MESA_allocate_memory
- */ 
-#ifndef GLX_MESA_allocate_memory
-#define GLX_MESA_allocate_memory 1
-
-extern void *glXAllocateMemoryMESA(Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
-extern void glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer);
-extern GLuint glXGetMemoryOffsetMESA(Display *dpy, int scrn, const void *pointer);
-typedef void * ( * PFNGLXALLOCATEMEMORYMESAPROC) (Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
-typedef void ( * PFNGLXFREEMEMORYMESAPROC) (Display *dpy, int scrn, void *pointer);
-typedef GLuint (* PFNGLXGETMEMORYOFFSETMESAPROC) (Display *dpy, int scrn, const void *pointer);
-
-#endif /* GLX_MESA_allocate_memory */
-
-/*
- * ARB ?. GLX_ARB_render_texture
- */
-#ifndef GLX_ARB_render_texture
-#define GLX_ARB_render_texture 1
-
-extern Bool glXBindTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
-extern Bool glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
-extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attribList);
-
-#endif /* GLX_ARB_render_texture */
-
-
-/*
- * Remove this when glxext.h is updated.
- */
-#ifndef GLX_NV_float_buffer
-#define GLX_NV_float_buffer 1
-
-#define GLX_FLOAT_COMPONENTS_NV         0x20B0
-
-#endif /* GLX_NV_float_buffer */
-
-
-/*** Should these go here, or in another header? */
-/*
-** GLX Events
-*/
-typedef struct {
-    int event_type;		/* GLX_DAMAGED or GLX_SAVED */
-    int draw_type;		/* GLX_WINDOW or GLX_PBUFFER */
-    unsigned long serial;	/* # of last request processed by server */
-    Bool send_event;		/* true if this came for SendEvent request */
-    Display *display;		/* display the event was read from */
-    GLXDrawable drawable;	/* XID of Drawable */
-    unsigned int buffer_mask;	/* mask indicating which buffers are affected */
-    unsigned int aux_buffer;	/* which aux buffer was affected */
-    int x, y;
-    int width, height;
-    int count;			/* if nonzero, at least this many more */
-} GLXPbufferClobberEvent;
-
-typedef union __GLXEvent {
-    GLXPbufferClobberEvent glxpbufferclobber;
-    long pad[24];
-} GLXEvent;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/glx_mangle.h b/nx-X11/extras/Mesa/include/GL/glx_mangle.h
deleted file mode 100644
index d0b47d94e..000000000
--- a/nx-X11/extras/Mesa/include/GL/glx_mangle.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  4.1
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#ifndef GLX_MANGLE_H
-#define GLX_MANGLE_H
-
-#define glXChooseVisual mglXChooseVisual
-#define glXCreateContext mglXCreateContext
-#define glXDestroyContext mglXDestroyContext
-#define glXMakeCurrent mglXMakeCurrent
-#define glXCopyContext mglXCopyContext
-#define glXSwapBuffers mglXSwapBuffers
-#define glXCreateGLXPixmap mglXCreateGLXPixmap
-#define glXDestroyGLXPixmap mglXDestroyGLXPixmap
-#define glXQueryExtension mglXQueryExtension
-#define glXQueryVersion mglXQueryVersion
-#define glXIsDirect mglXIsDirect
-#define glXGetConfig mglXGetConfig
-#define glXGetCurrentContext mglXGetCurrentContext
-#define glXGetCurrentDrawable mglXGetCurrentDrawable
-#define glXWaitGL mglXWaitGL
-#define glXWaitX mglXWaitX
-#define glXUseXFont mglXUseXFont
-#define glXQueryExtensionsString mglXQueryExtensionsString
-#define glXQueryServerString mglXQueryServerString
-#define glXGetClientString mglXGetClientString
-#define glXCreateGLXPixmapMESA mglXCreateGLXPixmapMESA
-#define glXReleaseBuffersMESA mglXReleaseBuffersMESA
-#define glXCopySubBufferMESA mglXCopySubBufferMESA
-#define glXGetVideoSyncSGI mglXGetVideoSyncSGI
-#define glXWaitVideoSyncSGI mglXWaitVideoSyncSGI
-
-/* GLX 1.4 */
-#define glXGetProcAddress mglXGetProcAddress
-
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/internal/dri_interface.h b/nx-X11/extras/Mesa/include/GL/internal/dri_interface.h
deleted file mode 100644
index 0f3555b57..000000000
--- a/nx-X11/extras/Mesa/include/GL/internal/dri_interface.h
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * (C) Copyright IBM Corporation 2004
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file dri_interface.h
- *
- * This file contains all the types and functions that define the interface
- * between a DRI driver and driver loader.  Currently, the most common driver
- * loader is the XFree86 libGL.so.  However, other loaders do exist, and in
- * the future the server-side libglx.a will also be a loader.
- * 
- * \author Kevin E. Martin <kevin@precisioninsight.com>
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-#ifndef DRI_INTERFACE_H
-#define DRI_INTERFACE_H
-
-#include <GL/internal/glcore.h>
-#include <drm.h>
-
-/**
- * \name DRI interface structures
- *
- * The following structures define the interface between the GLX client
- * side library and the DRI (direct rendering infrastructure).
- */
-/*@{*/
-typedef struct __DRIdisplayRec  __DRIdisplay;
-typedef struct __DRIscreenRec   __DRIscreen;
-typedef struct __DRIcontextRec  __DRIcontext;
-typedef struct __DRIdrawableRec __DRIdrawable;
-typedef struct __DRIdriverRec   __DRIdriver;
-typedef struct __DRIframebufferRec __DRIframebuffer;
-typedef struct __DRIversionRec     __DRIversion;
-typedef struct __DRIinterfaceMethodsRec  __DRIinterfaceMethods;
-typedef unsigned long __DRIid;
-typedef void __DRInativeDisplay;
-/*@}*/
-
-
-/**
- * \name Functions provided by the driver loader.
- */
-/*@{*/
-/**
- * Type of a pointer to \c glXGetScreenDriver, as returned by
- * \c glXGetProcAddress.  This function is used to get the name of the DRI
- * driver for the specified screen of the specified display.  The driver
- * name is typically used with \c glXGetDriverConfig.
- *
- * \sa glXGetScreenDriver, glXGetProcAddress, glXGetDriverConfig
- */
-typedef const char * (* PFNGLXGETSCREENDRIVERPROC) (__DRInativeDisplay *dpy, int scrNum);
-
-/**
- * Type of a pointer to \c glXGetDriverConfig, as returned by
- * \c glXGetProcAddress.  This function is used to get the XML document
- * describing the configuration options available for the specified driver.
- *
- * \sa glXGetDriverConfig, glXGetProcAddress, glXGetScreenDriver
- */
-typedef const char * (* PFNGLXGETDRIVERCONFIGPROC) (const char *driverName);
-
-/**
- * Type of a pointer to \c glxEnableExtension, as returned by
- * \c __DRIinterfaceMethods::getProcAddress.  This function is used to enable
- * a GLX extension on the specified screen.
- */
-typedef void (* PFNGLXSCRENABLEEXTENSIONPROC) ( void *psc, const char * name );
-/*@}*/
-
-
-/**
- * \name Functions and data provided by the driver.
- */
-/*@{*/
-
-typedef void *(CREATENEWSCREENFUNC)(__DRInativeDisplay *dpy, int scrn,
-    __DRIscreen *psc, const __GLcontextModes * modes,
-    const __DRIversion * ddx_version, const __DRIversion * dri_version,
-    const __DRIversion * drm_version, const __DRIframebuffer * frame_buffer,
-    void * pSAREA, int fd, int internal_api_version,
-    const __DRIinterfaceMethods * interface,
-    __GLcontextModes ** driver_modes);
-typedef CREATENEWSCREENFUNC* PFNCREATENEWSCREENFUNC;
-extern CREATENEWSCREENFUNC __driCreateNewScreen_20050727;
-
-
-/**
- * XML document describing the configuration options supported by the
- * driver.
- */
-extern const char __driConfigOptions[];
-
-/*@}*/
-
-
-/**
- * Stored version of some component (i.e., server-side DRI module, kernel-side
- * DRM, etc.).
- * 
- * \todo
- * There are several data structures that explicitly store a major version,
- * minor version, and patch level.  These structures should be modified to
- * have a \c __DRIversionRec instead.
- */
-struct __DRIversionRec {
-    int    major;        /**< Major version number. */
-    int    minor;        /**< Minor version number. */
-    int    patch;        /**< Patch-level. */
-};
-
-
-typedef void (*__DRIfuncPtr)(void);
-
-struct __DRIinterfaceMethodsRec {
-    /**
-     * Get pointer to named function.
-     */
-    __DRIfuncPtr (*getProcAddress)( const char * proc_name );
-
-    /**
-     * Create a list of \c __GLcontextModes structures.
-     */
-    __GLcontextModes * (*createContextModes)(unsigned count,
-        size_t minimum_bytes_per_struct);
-
-    /**
-     * Destroy a list of \c __GLcontextModes structures.
-     *
-     * \todo
-     * Determine if the drivers actually need to call this.
-     */
-    void (*destroyContextModes)( __GLcontextModes * modes );
-
-    /**
-     * Get the \c __DRIscreen for a given display and screen number.
-     */
-    __DRIscreen *(*getScreen)(__DRInativeDisplay *dpy, int screenNum);
-
-
-    /**
-     * \name Client/server protocol functions.
-     *
-     * These functions implement the DRI client/server protocol for
-     * context and drawable operations.  Platforms that do not implement
-     * the wire protocol (e.g., EGL) will implement glorified no-op functions.
-     */
-    /*@{*/
-    /**
-     * Determine if the specified window ID still exists.
-     * 
-     * \note
-     * Implementations may assume that the driver will only pass an ID into
-     * this function that actually corresponds to a window.  On
-     * implementations where windows can only be destroyed by the DRI driver
-     * (e.g., EGL), this function is allowed to always return \c GL_TRUE.
-     */
-    GLboolean (*windowExists)(__DRInativeDisplay *dpy, __DRIid draw);
-
-    /**
-     * Create the server-side portion of the GL context.
-     */
-    GLboolean (* createContext)( __DRInativeDisplay *dpy, int screenNum,
-        int configID, void * contextID, drm_context_t * hw_context );
-
-    /**
-     * Destroy the server-side portion of the GL context.
-     */
-    GLboolean (* destroyContext)( __DRInativeDisplay *dpy, int screenNum,
-        __DRIid context );
-
-    /**
-     * Create the server-side portion of the drawable.
-     */
-    GLboolean (*createDrawable)( __DRInativeDisplay * ndpy, int screen,
-        __DRIid drawable, drm_drawable_t * hHWDrawable );
-
-    /**
-     * Destroy the server-side portion of the drawable.
-     */
-    GLboolean (*destroyDrawable)( __DRInativeDisplay * ndpy, int screen,
-        __DRIid drawable );
-
-    /**
-     * This function is used to get information about the position, size, and
-     * clip rects of a drawable.
-     */
-    GLboolean (* getDrawableInfo) ( __DRInativeDisplay *dpy, int scrn,
-        __DRIid draw, unsigned int * index, unsigned int * stamp,
-        int * x, int * y, int * width, int * height,
-        int * numClipRects, drm_clip_rect_t ** pClipRects,
-        int * backX, int * backY,
-        int * numBackClipRects, drm_clip_rect_t ** pBackClipRects );
-    /*@}*/
-
-
-    /**
-     * \name Timing related functions.
-     */
-    /*@{*/
-    /**
-     * Get the 64-bit unadjusted system time (UST).
-     */
-    int (*getUST)(int64_t * ust);
-
-    /**
-     * Get the media stream counter (MSC) rate.
-     * 
-     * Matching the definition in GLX_OML_sync_control, this function returns
-     * the rate of the "media stream counter".  In practical terms, this is
-     * the frame refresh rate of the display.
-     */
-    GLboolean (*getMSCRate)(__DRInativeDisplay * dpy, __DRIid drawable,
-        int32_t * numerator, int32_t * denominator);
-    /*@}*/
-};
-
-   
-/**
- * Framebuffer information record.  Used by libGL to communicate information
- * about the framebuffer to the driver's \c __driCreateNewScreen function.
- * 
- * In XFree86, most of this information is derrived from data returned by
- * calling \c XF86DRIGetDeviceInfo.
- *
- * \sa XF86DRIGetDeviceInfo __DRIdisplayRec::createNewScreen
- *     __driUtilCreateNewScreen CallCreateNewScreen
- *
- * \bug This structure could be better named.
- */
-struct __DRIframebufferRec {
-    unsigned char *base;    /**< Framebuffer base address in the CPU's
-			     * address space.  This value is calculated by
-			     * calling \c drmMap on the framebuffer handle
-			     * returned by \c XF86DRIGetDeviceInfo (or a
-			     * similar function).
-			     */
-    int size;               /**< Framebuffer size, in bytes. */
-    int stride;             /**< Number of bytes from one line to the next. */
-    int width;              /**< Pixel width of the framebuffer. */
-    int height;             /**< Pixel height of the framebuffer. */
-    int dev_priv_size;      /**< Size of the driver's dev-priv structure. */
-    void *dev_priv;         /**< Pointer to the driver's dev-priv structure. */
-};
-
-
-/**
- * Screen dependent methods.  This structure is initialized during the
- * \c __DRIdisplayRec::createScreen call.
- */
-struct __DRIscreenRec {
-    /**
-     * Method to destroy the private DRI screen data.
-     */
-    void (*destroyScreen)(__DRInativeDisplay *dpy, int scrn, void *screenPrivate);
-
-    /**
-     * Method to create the private DRI drawable data and initialize the
-     * drawable dependent methods.
-     */
-    void *(*createNewDrawable)(__DRInativeDisplay *dpy, const __GLcontextModes *modes,
-			       __DRIid draw, __DRIdrawable *pdraw,
-			       int renderType, const int *attrs);
-
-    /**
-     * Method to return a pointer to the DRI drawable data.
-     */
-    __DRIdrawable *(*getDrawable)(__DRInativeDisplay *dpy, __DRIid draw,
-				  void *drawablePrivate);
-
-    /**
-     * Opaque pointer to private per screen direct rendering data.  \c NULL
-     * if direct rendering is not supported on this screen.  Never
-     * dereferenced in libGL.
-     */
-    void *private;
-
-    /**
-     * Get the number of vertical refreshes since some point in time before
-     * this function was first called (i.e., system start up).
-     * 
-     * \since Internal API version 20030317.
-     */
-    int (*getMSC)( void *screenPrivate, int64_t *msc );
-
-    /**
-     * Opaque pointer that points back to the containing 
-     * \c __GLXscreenConfigs.  This data structure is shared with DRI drivers
-     * but \c __GLXscreenConfigs is not. However, they are needed by some GLX
-     * functions called by DRI drivers.
-     *
-     * \since Internal API version 20030813.
-     */
-    void *screenConfigs;
-
-    /**
-     * Functions associated with MESA_allocate_memory.
-     *
-     * \since Internal API version 20030815.
-     */
-    /*@{*/
-    void *(*allocateMemory)(__DRInativeDisplay *dpy, int scrn, GLsizei size,
-			    GLfloat readfreq, GLfloat writefreq,
-			    GLfloat priority);
-   
-    void (*freeMemory)(__DRInativeDisplay *dpy, int scrn, GLvoid *pointer);
-   
-    GLuint (*memoryOffset)(__DRInativeDisplay *dpy, int scrn, const GLvoid *pointer);
-    /*@}*/
-
-    /**
-     * Method to create the private DRI context data and initialize the
-     * context dependent methods.
-     *
-     * \since Internal API version 20031201.
-     */
-    void * (*createNewContext)(__DRInativeDisplay *dpy, const __GLcontextModes *modes,
-			       int render_type,
-			       void *sharedPrivate, __DRIcontext *pctx);
-};
-
-/**
- * Context dependent methods.  This structure is initialized during the
- * \c __DRIscreenRec::createContext call.
- */
-struct __DRIcontextRec {
-    /**
-     * Method to destroy the private DRI context data.
-     */
-    void (*destroyContext)(__DRInativeDisplay *dpy, int scrn, void *contextPrivate);
-
-    /**
-     * Opaque pointer to private per context direct rendering data.
-     * \c NULL if direct rendering is not supported on the display or
-     * screen used to create this context.  Never dereferenced in libGL.
-     */
-    void *private;
-
-    /**
-     * Pointer to the mode used to create this context.
-     *
-     * \since Internal API version 20040317.
-     */
-    const __GLcontextModes * mode;
-
-    /**
-     * Method to bind a DRI drawable to a DRI graphics context.
-     *
-     * \since Internal API version 20050727.
-     */
-    GLboolean (*bindContext)(__DRInativeDisplay *dpy, int scrn, __DRIid draw,
-			 __DRIid read, __DRIcontext *ctx);
-
-    /**
-     * Method to unbind a DRI drawable from a DRI graphics context.
-     *
-     * \since Internal API version 20050727.
-     */
-    GLboolean (*unbindContext)(__DRInativeDisplay *dpy, int scrn, __DRIid draw,
-			   __DRIid read, __DRIcontext *ctx);
-};
-
-/**
- * Drawable dependent methods.  This structure is initialized during the
- * \c __DRIscreenRec::createDrawable call.  \c createDrawable is not called
- * by libGL at this time.  It's currently used via the dri_util.c utility code
- * instead.
- */
-struct __DRIdrawableRec {
-    /**
-     * Method to destroy the private DRI drawable data.
-     */
-    void (*destroyDrawable)(__DRInativeDisplay *dpy, void *drawablePrivate);
-
-    /**
-     * Method to swap the front and back buffers.
-     */
-    void (*swapBuffers)(__DRInativeDisplay *dpy, void *drawablePrivate);
-
-    /**
-     * Opaque pointer to private per drawable direct rendering data.
-     * \c NULL if direct rendering is not supported on the display or
-     * screen used to create this drawable.  Never dereferenced in libGL.
-     */
-    void *private;
-
-    /**
-     * Get the number of completed swap buffers for this drawable.
-     *
-     * \since Internal API version 20030317.
-     */
-    int (*getSBC)(__DRInativeDisplay *dpy, void *drawablePrivate, int64_t *sbc );
-
-    /**
-     * Wait for the SBC to be greater than or equal target_sbc.
-     *
-     * \since Internal API version 20030317.
-     */
-    int (*waitForSBC)( __DRInativeDisplay * dpy, void *drawablePriv,
-		       int64_t target_sbc,
-		       int64_t * msc, int64_t * sbc );
-
-    /**
-     * Wait for the MSC to equal target_msc, or, if that has already passed,
-     * the next time (MSC % divisor) is equal to remainder.  If divisor is
-     * zero, the function will return as soon as MSC is greater than or equal
-     * to target_msc.
-     * 
-     * \since Internal API version 20030317.
-     */
-    int (*waitForMSC)( __DRInativeDisplay * dpy, void *drawablePriv,
-		       int64_t target_msc, int64_t divisor, int64_t remainder,
-		       int64_t * msc, int64_t * sbc );
-
-    /**
-     * Like \c swapBuffers, but does NOT have an implicit \c glFlush.  Once
-     * rendering is complete, waits until MSC is equal to target_msc, or
-     * if that has already passed, waits until (MSC % divisor) is equal
-     * to remainder.  If divisor is zero, the swap will happen as soon as
-     * MSC is greater than or equal to target_msc.
-     * 
-     * \since Internal API version 20030317.
-     */
-    int64_t (*swapBuffersMSC)(__DRInativeDisplay *dpy, void *drawablePrivate,
-			      int64_t target_msc,
-			      int64_t divisor, int64_t remainder);
-
-    /**
-     * Enable or disable frame usage tracking.
-     * 
-     * \since Internal API version 20030317.
-     */
-    int (*frameTracking)(__DRInativeDisplay *dpy, void *drawablePrivate, GLboolean enable);
-
-    /**
-     * Retrieve frame usage information.
-     * 
-     * \since Internal API version 20030317.
-     */
-    int (*queryFrameTracking)(__DRInativeDisplay *dpy, void *drawablePrivate,
-			      int64_t * sbc, int64_t * missedFrames,
-			      float * lastMissedUsage, float * usage );
-
-    /**
-     * Used by drivers that implement the GLX_SGI_swap_control or
-     * GLX_MESA_swap_control extension.
-     *
-     * \since Internal API version 20030317.
-     */
-    unsigned swap_interval;
-};
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/internal/sarea.h b/nx-X11/extras/Mesa/include/GL/internal/sarea.h
deleted file mode 100644
index 77c16e0ef..000000000
--- a/nx-X11/extras/Mesa/include/GL/internal/sarea.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */
-/**
- * \file sarea.h 
- * SAREA definitions.
- * 
- * \author Kevin E. Martin <kevin@precisioninsight.com>
- * \author Jens Owen <jens@tungstengraphics.com>
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- */
-
-/*
- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */
-
-#ifndef _SAREA_H_
-#define _SAREA_H_
-
-#include "xf86drm.h"
-
-/* SAREA area needs to be at least a page */
-#if defined(__alpha__)
-#define SAREA_MAX 			0x2000
-#elif defined(__ia64__)
-#define SAREA_MAX			0x10000		/* 64kB */
-#else
-/* Intel 830M driver needs at least 8k SAREA */
-#define SAREA_MAX			0x2000
-#endif
-
-#define SAREA_MAX_DRAWABLES 		256
-
-#define SAREA_DRAWABLE_CLAIMED_ENTRY	0x80000000
-
-/**
- * SAREA per drawable information.
- *
- * \sa _XF86DRISAREA.
- */
-typedef struct _XF86DRISAREADrawable {
-    unsigned int	stamp;
-    unsigned int	flags;
-} XF86DRISAREADrawableRec, *XF86DRISAREADrawablePtr;
-
-/**
- * SAREA frame information.
- *
- * \sa  _XF86DRISAREA.
- */
-typedef struct _XF86DRISAREAFrame {
-    unsigned int        x;
-    unsigned int        y;
-    unsigned int        width;
-    unsigned int        height;
-    unsigned int        fullscreen;
-} XF86DRISAREAFrameRec, *XF86DRISAREAFramePtr;
-
-/**
- * SAREA definition.
- */
-typedef struct _XF86DRISAREA {
-    /** first thing is always the DRM locking structure */
-    drmLock			lock;
-    /** \todo Use readers/writer lock for drawable_lock */
-    drmLock			drawable_lock;
-    XF86DRISAREADrawableRec	drawableTable[SAREA_MAX_DRAWABLES];
-    XF86DRISAREAFrameRec        frame;
-    drm_context_t			dummy_context;
-} XF86DRISAREARec, *XF86DRISAREAPtr;
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/mesa_wgl.h b/nx-X11/extras/Mesa/include/GL/mesa_wgl.h
deleted file mode 100644
index 21473763e..000000000
--- a/nx-X11/extras/Mesa/include/GL/mesa_wgl.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.1
- *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-/* prototypes for the Mesa WGL functions */
-/* relocated here so that I could make GLUT get them properly */
-
-#define _mesa_wgl_h_
-
-#ifndef _mesa_wgl_h_
-#define _mesa_wgl_h_
-
-
-#include <GL/gl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
-#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
-#    define GLAPI __declspec(dllexport)
-#    define WGLAPI __declspec(dllexport)
-#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
-#    define GLAPI __declspec(dllimport)
-#    define WGLAPI __declspec(dllimport)
-#  else /* for use with static link lib build of Win32 edition only */
-#    define GLAPI extern
-#    define WGLAPI __declspec(dllimport)
-#  endif /* _STATIC_MESA support */
-#  define GLAPIENTRY __stdcall
-#else
-/* non-Windows compilation */
-#  define GLAPI extern
-#  define GLAPIENTRY
-#endif /* WIN32 / CYGWIN32 bracket */
-
-
-#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP)
-#ifndef _GNU_H_WINDOWS32_FUNCTIONS
-#	ifdef UNICODE
-#		define wglUseFontBitmaps  wglUseFontBitmapsW
-#		define wglUseFontOutlines  wglUseFontOutlinesW
-#	else
-#		define wglUseFontBitmaps  wglUseFontBitmapsA
-#		define wglUseFontOutlines  wglUseFontOutlinesA
-#	endif /* !UNICODE */
-#endif /* _GNU_H_WINDOWS32_FUNCTIONS */
-typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR;
-typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT;
-typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
-#endif
-
-
-#ifdef _MSC_VER
-#  pragma warning( disable : 4615 ) /* pragma warning : unknown user warning type*/
-#  pragma warning( push )
-#  pragma warning( disable : 4273 ) /* 'function' : inconsistent DLL linkage. dllexport assumed. */
-#endif
-
-WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
-WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC,HGLRC);
-WGLAPI int   GLAPIENTRY wglSetPixelFormat(HDC, int, const PIXELFORMATDESCRIPTOR *);
-WGLAPI int   GLAPIENTRY wglSwapBuffers(HDC hdc);
-WGLAPI HDC   GLAPIENTRY wglGetCurrentDC(void);
-WGLAPI HGLRC GLAPIENTRY wglCreateContext(HDC);
-WGLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC,int);
-WGLAPI HGLRC GLAPIENTRY wglGetCurrentContext(void);
-WGLAPI PROC  GLAPIENTRY wglGetProcAddress(const char*);
-WGLAPI int   GLAPIENTRY wglChoosePixelFormat(HDC, const PIXELFORMATDESCRIPTOR *);
-WGLAPI int   GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int);
-WGLAPI int   GLAPIENTRY wglDeleteContext(HGLRC);
-WGLAPI int   GLAPIENTRY wglDescribeLayerPlane(HDC, int, int, unsigned int,LPLAYERPLANEDESCRIPTOR);
-WGLAPI int   GLAPIENTRY wglDescribePixelFormat(HDC,int, unsigned int, LPPIXELFORMATDESCRIPTOR);
-WGLAPI int   GLAPIENTRY wglGetLayerPaletteEntries(HDC, int, int, int,COLORREF *);
-WGLAPI int   GLAPIENTRY wglGetPixelFormat(HDC hdc);
-WGLAPI int   GLAPIENTRY wglMakeCurrent(HDC, HGLRC);
-WGLAPI int   GLAPIENTRY wglRealizeLayerPalette(HDC, int, int);
-WGLAPI int   GLAPIENTRY wglSetLayerPaletteEntries(HDC, int, int, int,const COLORREF *);
-WGLAPI int   GLAPIENTRY wglShareLists(HGLRC, HGLRC);
-WGLAPI int   GLAPIENTRY wglSwapLayerBuffers(HDC, unsigned int);
-WGLAPI int   GLAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, unsigned long);
-WGLAPI int   GLAPIENTRY wglUseFontBitmapsW(HDC, unsigned long, unsigned long, unsigned long);
-WGLAPI int   GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
-WGLAPI int   GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
-WGLAPI int   GLAPIENTRY SwapBuffers(HDC);
-WGLAPI int   GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *);
-WGLAPI int   GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,LPPIXELFORMATDESCRIPTOR);
-WGLAPI int   GLAPIENTRY GetPixelFormat(HDC);
-WGLAPI int   GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *);
-
-#ifdef _MSC_VER
-#  pragma warning( pop )
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _mesa_wgl_h_ */
diff --git a/nx-X11/extras/Mesa/include/GL/mglmesa.h b/nx-X11/extras/Mesa/include/GL/mglmesa.h
deleted file mode 100644
index d9ba61c17..000000000
--- a/nx-X11/extras/Mesa/include/GL/mglmesa.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************

-*

-*                      Mesa bindings for SciTech MGL

-*

-*                   Copyright (C) 1996 SciTech Software.

-*                           All rights reserved.

-*

-* Filename:     mglmesa.h

-* Version:      Revision: 1.1.1.1

-*

-* Language:     ANSI C

-* Environment:  Any

-*

-* Description:  Header file for the Mesa/OpenGL interface bindings for the

-*               SciTech MGL graphics library. Uses the MGL internal

-*               device context structures to get direct access to the

-*               high performance MGL rasterization functions for maximum

-*               performance. Utilizes the VESA VBE/AF Accelerator Functions

-*               via the MGL's accelerated device driver functions, as well

-*               as basic DirectDraw accelerated functions provided by the

-*               MGL.

-*

-* This library is free software; you can redistribute it and/or

-* modify it under the terms of the GNU Library General Public

-* License as published by the Free Software Foundation; either

-* version 2 of the License, or (at your option) any later version.

-*

-* This library is distributed in the hope that it will be useful,

-* but WITHOUT ANY WARRANTY; without even the implied warranty of

-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-* Library General Public License for more details.

-*

-* You should have received a copy of the GNU Library General Public

-* License along with this library; if not, write to the Free

-* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-*

-*

-****************************************************************************/

-

-#ifndef __MGLMESA_H

-#define __MGLMESA_H

-

-#include "mgraph.h"

-

-/*------------------------- Function Prototypes ---------------------------*/

-

-#ifdef  __cplusplus

-extern "C" {            /* Use "C" linkage when in C++ mode */

-#endif

-

-#ifndef __WINDOWS__

-#define GLAPIENTRY

-#endif

-

-#ifdef  __WINDOWS__

-bool    GLAPIENTRY MGLMesaInitDLL(MGLCallbacks *cb,char *version);

-#endif

-void    GLAPIENTRY MGLMesaChooseVisual(MGLDC *dc,MGLVisual *visual);

-bool    GLAPIENTRY MGLMesaSetVisual(MGLDC *dc,MGLVisual *visual);

-bool    GLAPIENTRY MGLMesaCreateContext(MGLDC *dc,bool forceMemDC);

-void    GLAPIENTRY MGLMesaDestroyContext(MGLDC *dc);

-void    GLAPIENTRY MGLMesaMakeCurrent(MGLDC *dc);

-void    GLAPIENTRY MGLMesaSwapBuffers(MGLDC *dc,bool waitVRT);

-

-/* Palette manipulation support. The reason we provide palette manipulation

- * routines is so that when rendering in double buffered modes with a

- * software backbuffer, the palette for the backbuffer is kept consistent

- * with the hardware front buffer.

- */

-

-void    GLAPIENTRY MGLMesaSetPaletteEntry(MGLDC *dc,int entry,uchar red,uchar green,uchar blue);

-void    GLAPIENTRY MGLMesaSetPalette(MGLDC *dc,palette_t *pal,int numColors,int startIndex);

-void    GLAPIENTRY MGLMesaRealizePalette(MGLDC *dc,int numColors,int startIndex,int waitVRT);

-

-#ifdef  __cplusplus

-}                       /* End of "C" linkage for C++   */

-#endif  /* __cplusplus */

-

-#endif  /* __MGLMESA_H */

diff --git a/nx-X11/extras/Mesa/include/GL/miniglx.h b/nx-X11/extras/Mesa/include/GL/miniglx.h
deleted file mode 100644
index 8c6180be6..000000000
--- a/nx-X11/extras/Mesa/include/GL/miniglx.h
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.1
- *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-/**
- * \file miniglx.h
- * \brief Mini GLX interface functions.
- * \author Brian Paul
- *
- * See comments miniglx.c for more information.
- */
-
-#ifndef MINIGLX_H
-#define MINIGLX_H
-
-#include <GL/gl.h>
-#include <stdlib.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- * \name Replacement Xlib/GLX types
- */
-/*@{*/
-/**
- * \brief Boolean type.
- * 
- * It can have the values #True or #False.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef int Bool;
-#endif
-typedef int MINI_Bool;
-
-/**
- * \brief Color map.
- *
- * Alias for private ::MiniGLXColormapRec structure.
- */
-typedef struct MiniGLXColormapRec *MINI_Colormap;
-#ifndef MINIGLX_NO_XTYPES
-typedef struct MiniGLXColormapRec *Colormap;
-#endif
-
-/**
- * \brief Window attributes.
- */
-typedef struct MiniGLXSetWindowAttributesRec {
-   int background_pixel; /**< \brief background pixel */
-   int border_pixel;     /**< \brief border pixel value */
-   MINI_Colormap colormap;    /**< \brief color map to be associated with window */
-   int event_mask;       /**< \brief set of events that should be saved */
-} XSetWindowAttributes;
-
-/**
- * \brief Visual.
- *
- * Alias for the private ::MiniGLXVisualRec structure.
- *
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXVisualRec Visual;
-
-/**
- * \brief Visual information.
- *
- * \sa \ref datatypes.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef unsigned long VisualID;
-#endif
-typedef unsigned long MINI_VisualID;
-typedef struct MiniGLXXVisualInfoRec {
-   Visual *visual;	/**< \brief pointer to the GLX Visual */
-   MINI_VisualID visualid;	/**< \brief visual ID */
-   int screen;		/**< \brief screen number */
-   int depth;		/**< \brief bit depth */
-#if defined(__cplusplus) || defined(c_plusplus)
-   int c_class;		/**< \brief class */
-#else
-   int class;		/**< \brief class */
-#endif
-   int bits_per_rgb;	/**< \brief total bits per pixel */
-} XVisualInfo;
-
-/**
- * \brief GLX Frame Buffer Configuration (for pbuffers)
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXFBConfigRec {
-   XVisualInfo *visInfo;
-} GLXFBConfig;
-
-
-/**
- * \brief Display handle.
- *
- * Alias for the private ::MiniGLXDisplayRec structure.
- *
- * \sa \ref datatypes.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef struct MiniGLXDisplayRec   Display;
-#endif
-typedef struct MiniGLXDisplayRec   MINI_Display;
-
-/**
- * \brief Window handle.
- *
- * Alias for the private ::MiniGLXWindowRec structure.
- *
- * \sa \ref datatypes.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef struct MiniGLXWindowRec   *Window;
-#endif
-typedef struct MiniGLXWindowRec   *MINI_Window;
-
-/**
- * \brief Drawable.
- *
- * Alias for the private ::MiniGLXWindowRec structure.
- * 
- * For Mini GLX only the full-screen window can be used as source and
- * destination in graphics operations.
- *
- * \sa \ref datatypes.
- */
-#ifndef MINIGLX_NO_XTYPES
-typedef struct MiniGLXWindowRec   *Drawable;
-#endif
-typedef struct MiniGLXWindowRec   *MINI_Drawable;
-
-/**
- * \brief GLX drawable.
- *
- * Alias for the private ::MiniGLXWindowRec structure.
- * 
- * Same as #Drawable.
- *
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXWindowRec   *GLXDrawable;
-
-/**
- * \brief GLX pbuffer.
- *
- * Alias for the private ::MiniGLXWindowRec structure.
- * 
- * Same as #Drawable.
- *
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXWindowRec   *GLXPbuffer;
-
-/**
- * \brief GLX context.
- * 
- * Alias for the private ::MiniGLXContext structure.
- *
- * \sa \ref datatypes.
- */
-typedef struct MiniGLXContextRec  *GLXContext;
-/*@}*/
-
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window window;
-	int x, y;
-	int width, height;
-	int count;		/* if non-zero, at least this many more */
-} XExposeEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window parent;		/* parent of the window */
-        MINI_Window window;		/* window id of window created */
-	int x, y;		/* window location */
-	int width, height;	/* size of window */
-	int border_width;	/* border width */
-	MINI_Bool override_redirect;	/* creation should be overridden */
-} XCreateWindowEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window event;
-	MINI_Window window;
-} XDestroyWindowEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window event;
-	MINI_Window window;
-	MINI_Bool from_configure;
-} XUnmapEvent;
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window event;
-	MINI_Window window;
-	MINI_Bool override_redirect;	/* boolean, is override set... */
-} XMapEvent;
-
-
-typedef struct {
-	int type;
-	unsigned long serial;	/* # of last request processed by server */
-	MINI_Bool send_event;	/* true if this came from a SendEvent request */
-	MINI_Display *display;	/* Display the event was read from */
-	MINI_Window parent;
-	MINI_Window window;
-} XMapRequestEvent;
-
-typedef union _XEvent {
-        int type;		/* must not be changed; first element */
-	XExposeEvent xexpose;
-        XCreateWindowEvent xcreatewindow;
-	XDestroyWindowEvent xdestroywindow;
-	XUnmapEvent xunmap;
-	XMapEvent xmap;
-	XMapRequestEvent xmaprequest;
-	long pad[24];
-} XEvent;
-
-
-/**
- * \name Xlib constants
- */
-/*@{*/
-#define False                0
-#define True                 1
-#define None                 0
-#define AllocNone            0
-#define InputOutput          1
-#define ExposureMask         (1L<<15) 
-#define StructureNotifyMask  (1L<<17) 
-#define CWBackPixel          (1L<<1)
-#define CWBorderPixel        (1L<<3)
-#define CWEventMask          (1L<<11)
-#define CWColormap           (1L<<13)
-#define PseudoColor          3
-#define TrueColor            4
-#define VisualIDMask     0x1
-#define VisualScreenMask     0x2
-#define Expose		     12
-#define CreateNotify	     16
-#define DestroyNotify	     17
-#define UnmapNotify	     18
-#define MapNotify	     19
-#define MapRequest	     20
-
-/*@}*/
-
-/**
- * \name Standard GLX tokens
- */
-/*@{*/
-#define GLX_USE_GL		1
-#define GLX_BUFFER_SIZE		2
-#define GLX_LEVEL		3
-#define GLX_RGBA		4
-#define GLX_DOUBLEBUFFER	5
-#define GLX_STEREO		6
-#define GLX_AUX_BUFFERS		7
-#define GLX_RED_SIZE		8
-#define GLX_GREEN_SIZE		9
-#define GLX_BLUE_SIZE		10
-#define GLX_ALPHA_SIZE		11
-#define GLX_DEPTH_SIZE		12
-#define GLX_STENCIL_SIZE	13
-#define GLX_ACCUM_RED_SIZE	14
-#define GLX_ACCUM_GREEN_SIZE	15
-#define GLX_ACCUM_BLUE_SIZE	16
-#define GLX_ACCUM_ALPHA_SIZE	17
-#define GLX_BAD_ATTRIBUTE       1
-#define GLX_BAD_VISUAL          4
-/*@}*/
-
-
-/**
- * \name Unique to Mini GLX
- *
- * At compile time, the Mini GLX interface version can be tested with the
- * MINI_GLX_VERSION_1_x preprocessor tokens.
- *
- * \sa glXQueryVersion()
- */
-/*@{*/
-/** \brief Defined if version 1.0 of Mini GLX is supported. */
-#define MINI_GLX_VERSION_1_0    1
-/** \brief Defined if version 1.1 of Mini GLX is supported. */
-#define MINI_GLX_VERSION_1_1    1
-/*@}*/
-
-
-/**
- * \name Server-specific functions
- */
-extern MINI_Display *
-__miniglx_StartServer( const char *display_name );
-
-extern int
-__miniglx_Select( MINI_Display *dpy, int maxfd,
-		  fd_set *rfds, fd_set *wfds, fd_set *xfds,
-		  struct timeval *tv );
-
-
-/**
- * \name Simulated Xlib functions
- */
-/*@{*/
-extern MINI_Display *
-XOpenDisplay( const char *dpy_name );
-
-
-extern void
-XCloseDisplay( MINI_Display *display );
-
-extern MINI_Window
-XCreateWindow( MINI_Display *display, MINI_Window parent, int x, int y,
-               unsigned int width, unsigned int height,
-               unsigned int border_width, int depth, unsigned int winclass,
-               Visual *visual, unsigned long valuemask,
-               XSetWindowAttributes *attributes );
-
-extern int 
-XNextEvent(MINI_Display *display, XEvent *event_return);
-
-extern MINI_Bool 
-XCheckMaskEvent( MINI_Display *dpy, long event_mask, XEvent *event_return );
-
-/**
- * \brief Return the root window.
- * 
- * \param display the display handle. It is ignored by Mini GLX, but should be
- * the value returned by XOpenDisplay().
- * \param screen the screen number on the host server. It is ignored by Mini
- * GLX but should be zero.
- *
- * \return the root window. Always zero on Mini GLX.
- */
-#define RootWindow(display, screen) 0
-#define DefaultScreen(dpy)  0
-
-extern void
-XDestroyWindow( MINI_Display *display, MINI_Window w );
-
-extern void
-XMapWindow( MINI_Display *display, MINI_Window w );
-
-/* Should clients have access to this?
- */
-extern void
-XUnmapWindow( MINI_Display *display, MINI_Window w );
-
-extern MINI_Colormap
-XCreateColormap( MINI_Display *display, MINI_Window w, Visual *visual, int alloc );
-
-extern void
-XFreeColormap( MINI_Display *display, MINI_Colormap cmap );
-
-extern void
-XFree( void *data );
-
-extern XVisualInfo *
-XGetVisualInfo( MINI_Display *display, long vinfo_mask,
-                XVisualInfo *vinfo_template, int *nitems_return );
-/*@}*/
-
-
-
-/**
- * \name GLX functions
- */
-/*@{*/
-extern XVisualInfo*
-glXChooseVisual( MINI_Display *dpy, int screen, int *attribList );
-
-extern int
-glXGetConfig( MINI_Display *dpy, XVisualInfo *vis, int attrib, int *value );
-
-extern GLXContext
-glXCreateContext( MINI_Display *dpy, XVisualInfo *vis,
-                  GLXContext shareList, MINI_Bool direct );
-
-extern void
-glXDestroyContext( MINI_Display *dpy, GLXContext ctx );
-
-extern MINI_Bool
-glXMakeCurrent( MINI_Display *dpy, GLXDrawable drawable, GLXContext ctx);
-
-extern void
-glXSwapBuffers( MINI_Display *dpy, GLXDrawable drawable );
-
-extern GLXContext
-glXGetCurrentContext( void );
-
-extern GLXDrawable
-glXGetCurrentDrawable( void );
-
-extern void 
-(*glXGetProcAddress(const GLubyte *procname))( void );
-
-extern MINI_Bool
-glXQueryVersion( MINI_Display *dpy, int *major, int *minor );
-
-/* Added in MiniGLX 1.1 */
-extern GLXPbuffer
-glXCreatePbuffer( MINI_Display *dpy, GLXFBConfig config, const int *attribList );
-
-extern void
-glXDestroyPbuffer( MINI_Display *dpy, GLXPbuffer pbuf );
-
-extern GLXFBConfig *
-glXChooseFBConfig( MINI_Display *dpy, int screen, const int *attribList,
-                   int *nitems );
-
-extern XVisualInfo *
-glXGetVisualFromFBConfig( MINI_Display *dpy, GLXFBConfig config );
-
-extern void *glXAllocateMemoryMESA(Display *dpy, int scrn,
-				   size_t size, float readFreq,
-				   float writeFreq, float priority);
-
-extern void glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer);
-
-extern GLuint glXGetMemoryOffsetMESA( Display *dpy, int scrn,
-				      const void *pointer );
-/*@}*/
-
-extern void
-__glXScrEnableExtension( void *, const char * name );
-
-/*@}*/
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MINIGLX_H */
diff --git a/nx-X11/extras/Mesa/include/GL/svgamesa.h b/nx-X11/extras/Mesa/include/GL/svgamesa.h
deleted file mode 100644
index 67c0e4c5c..000000000
--- a/nx-X11/extras/Mesa/include/GL/svgamesa.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  4.0
- * Copyright (C) 1995-2001  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-/*
- * SVGA/Mesa interface for Linux.
- */
-
-
-/*
- * Intro to using the VGA/Mesa interface
- *
- * 1. #include the <vga.h> file
- * 2. Call vga_init() to initialize the SVGA library.
- * 3. Call vga_setmode() to specify the screen size and color depth.
- * 4. Call SVGAMesaCreateContext() to setup a Mesa context.  If using 8-bit
- *    color Mesa assumes color index mode, if using 16-bit or deeper color
- *    Mesa assumes RGB mode.
- * 5. Call SVGAMesaMakeCurrent() to activate the Mesa context.
- * 6. You can now use the Mesa API functions.
- * 7. Before exiting, call SVGAMesaDestroyContext() then vga_setmode(TEXT)
- *    to restore the original text screen.
- *
- * Notes
- * 1. You must run your executable as root (or use the set UID-bit) because
- *    the SVGA library requires it.
- * 2. The SVGA driver is not fully implemented yet.  See svgamesa.c for what
- *    has to be done yet.
- */
-
-
-#ifndef SVGAMESA_H
-#define SVGAMESA_H
-
-
-#define SVGAMESA_MAJOR_VERSION 4
-#define SVGAMESA_MINOR_VERSION 0
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include "GL/gl.h"
-
-
-
-/*
- * This is the SVGAMesa context 'handle':
- */
-typedef struct svgamesa_context *SVGAMesaContext;
-
-
-
-/*
- * doubleBuffer flag new in version 2.4
- */
-extern int SVGAMesaInit( int GraphMode );
-
-extern int SVGAMesaClose( void );
-
-extern SVGAMesaContext SVGAMesaCreateContext( GLboolean doubleBuffer );
-
-extern void SVGAMesaDestroyContext( SVGAMesaContext ctx );
-
-extern void SVGAMesaMakeCurrent( SVGAMesaContext ctx );
-
-extern void SVGAMesaSwapBuffers( void );
-
-extern void SVGAMesaSetCI(int ndx, GLubyte red, GLubyte green, GLubyte blue);
-
-extern SVGAMesaContext SVGAMesaGetCurrentContext( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/uglglutshapes.h b/nx-X11/extras/Mesa/include/GL/uglglutshapes.h
deleted file mode 100644
index 28192de2d..000000000
--- a/nx-X11/extras/Mesa/include/GL/uglglutshapes.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* uglglutshapes.h - Public header GLUT Shapes */
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. */
-
-/* This program is freely distributable without licensing fees  and is
-   provided without guarantee or warrantee expressed or  implied. This
-   program is -not- in the public domain. */
-
-#ifndef GLUTSHAPES_H
-#define GLUTSHAPES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <GL/gl.h>  
-
-void glutWireSphere (GLdouble radius, GLint slices, GLint stacks);
-void glutSolidSphere (GLdouble radius, GLint slices, GLint stacks);
-void glutWireCone (GLdouble base, GLdouble height,
-		   GLint slices, GLint stacks);
-void glutSolidCone (GLdouble base, GLdouble height,
-		    GLint slices, GLint stacks);
-void glutWireCube (GLdouble size);
-void glutSolidCube (GLdouble size);
-void glutWireTorus (GLdouble innerRadius, GLdouble outerRadius,
-		    GLint sides, GLint rings);
-void glutSolidTorus (GLdouble innerRadius, GLdouble outerRadius,
-		     GLint sides, GLint rings);
-void glutWireDodecahedron (void);
-void glutSolidDodecahedron (void);
-void glutWireOctahedron (void);
-void glutSolidOctahedron (void);
-void glutWireTetrahedron (void);
-void glutSolidTetrahedron (void);
-void glutWireIcosahedron (void);
-void glutSolidIcosahedron (void);
-void glutWireTeapot (GLdouble size);
-void glutSolidTeapot (GLdouble size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/uglmesa.h b/nx-X11/extras/Mesa/include/GL/uglmesa.h
deleted file mode 100644
index 7ef584350..000000000
--- a/nx-X11/extras/Mesa/include/GL/uglmesa.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* uglmesa.h - Public header UGL/Mesa */
-
-/* Copyright (C) 2001 by Wind River Systems, Inc */
-
-/*
- * Mesa 3-D graphics library
- * Version:  4.0
- *
- * The MIT License
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * Author:
- * Stephane Raimbault <stephane.raimbault@windriver.com> 
- */
-
-#ifndef UGLMESA_H
-#define UGLMESA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UGL_MESA_MAJOR_VERSION 4
-#define UGL_MESA_MINOR_VERSION 0
-
-#include <GL/gl.h>
-#include <ugl/ugl.h>
-
-/*
- * Values for display mode of uglMesaCreateContext ()
- */
-
-/*
- * With these mask values, it's possible to test double buffer mode
- * with UGL_MESA_DOUBLE mask
- *
- * SINGLE  0000 0001
- * DOUBLE  0000 0110
- * -  SOFT 0000 0010
- * -  HARD 0000 0100
- * WINDML  0001 0000
- *
- * 
- */
-#define UGL_MESA_SINGLE            0x01
-#define UGL_MESA_DOUBLE            0x06
-#define UGL_MESA_DOUBLE_SOFTWARE   0x02
-#define UGL_MESA_DOUBLE_HARDWARE   0x04
-    
-#define UGL_MESA_WINDML_EXCLUSIVE  0x10
-
-#define UGL_MESA_FULLSCREEN_WIDTH  0x0
-#define UGL_MESA_FULLSCREEN_HEIGHT 0x0
-
-/*
- * uglMesaPixelStore() parameters:
- */
-    
-#define UGL_MESA_ROW_LENGTH	   0x20
-#define UGL_MESA_Y_UP              0x21
-
-/* 
- * Accepted by uglMesaGetIntegerv:
- */
-
-#define UGL_MESA_LEFT_X		        0x01
-#define UGL_MESA_TOP_Y		        0x02    
-#define UGL_MESA_WIDTH		        0x03
-#define UGL_MESA_HEIGHT		        0x04
-#define UGL_MESA_DISPLAY_WIDTH          0x05
-#define UGL_MESA_DISPLAY_HEIGHT         0x06
-#define UGL_MESA_COLOR_FORMAT	        0x07
-#define UGL_MESA_COLOR_MODEL            0x08
-#define UGL_MESA_PIXEL_FORMAT           0x09
-#define UGL_MESA_TYPE		        0x0A
-#define UGL_MESA_RGB		        0x0B
-#define UGL_MESA_COLOR_INDEXED          0x0C
-#define UGL_MESA_SINGLE_BUFFER          0x0D
-#define UGL_MESA_DOUBLE_BUFFER          0x0E
-#define UGL_MESA_DOUBLE_BUFFER_SOFTWARE 0x0F
-#define UGL_MESA_DOUBLE_BUFFER_HARDWARE 0x10
-    
-/*
- * typedefs
- */
-
-typedef struct uglMesaContext * UGL_MESA_CONTEXT;
-    
-UGL_MESA_CONTEXT uglMesaCreateNewContext (GLenum mode,
-					  UGL_MESA_CONTEXT share_list);
-
-UGL_MESA_CONTEXT  uglMesaCreateNewContextExt (GLenum mode,
-					      GLint depth_bits,
-					      GLint stencil_bits,
-					      GLint accum_red_bits,
-					      GLint accum_green_bits,
-					      GLint accum_blue_bits,
-					      GLint accum_alpha_bits,
-					      UGL_MESA_CONTEXT share_list);
-
-GLboolean uglMesaMakeCurrentContext (UGL_MESA_CONTEXT umc,
-				     GLsizei left, GLsizei top,
-				     GLsizei width, GLsizei height);
-
-GLboolean uglMesaMoveWindow (GLsizei dx, GLsizei dy);
-
-GLboolean uglMesaMoveToWindow (GLsizei left, GLsizei top);
-
-GLboolean uglMesaResizeWindow (GLsizei dw, GLsizei dh);
-
-GLboolean uglMesaResizeToWindow (GLsizei width, GLsizei height);
-
-void uglMesaDestroyContext (void);
-
-UGL_MESA_CONTEXT uglMesaGetCurrentContext (void);
-
-void uglMesaSwapBuffers (void);
-
-void uglMesaPixelStore (GLint pname, GLint value);
-
-void uglMesaGetIntegerv (GLint pname, GLint *value);
-
-GLboolean uglMesaGetDepthBuffer (GLint *width, GLint *height,
-				 GLint *bytesPerValue, void **buffer);
-
-GLboolean uglMesaGetColorBuffer (GLint *width, GLint *height,
-				 GLint *format, void **buffer);
-
-GLboolean uglMesaSetColor (GLubyte index, GLfloat red,
-			   GLfloat green, GLfloat blue);
-  
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/vms_x_fix.h b/nx-X11/extras/Mesa/include/GL/vms_x_fix.h
deleted file mode 100644
index db754f655..000000000
--- a/nx-X11/extras/Mesa/include/GL/vms_x_fix.h
+++ /dev/null
@@ -1,880 +0,0 @@
-/***************************************************************************
- *                                                                         *
- * Repair definitions of Xlib when compileing with /name=(as_is) on VMS    *
- *                                                                         *
- * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl)                        *
- *                                                                         *
- * Last revision : 22 August 2000                                          *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef VMS_X_FIX
-#define VMS_X_FIX
-
-#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE 
-#define XAllocClassHint XALLOCCLASSHINT
-#define XAllocColor XALLOCCOLOR
-#define XAllocColorCells XALLOCCOLORCELLS
-#define XAllocSizeHints XALLOCSIZEHINTS
-#define XAllocWMHints XALLOCWMHINTS
-#define XAutoRepeatOff XAUTOREPEATOFF
-#define XAutoRepeatOn XAUTOREPEATON
-#define XBaseFontNameListOfFontSet XBASEFONTNAMELISTOFFONTSET
-#define XBell XBELL
-#define XBitmapPad XBITMAPPAD
-#define XChangeActivePointerGrab XCHANGEACTIVEPOINTERGRAB
-#define XChangeGC XCHANGEGC
-#define XChangeProperty XCHANGEPROPERTY
-#define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
-#define XCheckIfEvent XCHECKIFEVENT
-#define XCheckMaskEvent XCHECKMASKEVENT
-#define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT
-#define XCheckWindowEvent XCHECKWINDOWEVENT
-#define XClearArea XCLEARAREA
-#define XClearWindow XCLEARWINDOW
-#define XClipBox XCLIPBOX
-#define XCloseDisplay XCLOSEDISPLAY
-#define XCloseIM XCLOSEIM
-#define XConfigureWindow XCONFIGUREWINDOW
-#define XConvertSelection XCONVERTSELECTION
-#define XCopyArea XCOPYAREA
-#define XCopyGC XCOPYGC
-#define XCopyPlane XCOPYPLANE
-#define XCreateBitmapFromData XCREATEBITMAPFROMDATA
-#define XCreateColormap XCREATECOLORMAP
-#define XCreateFontCursor XCREATEFONTCURSOR
-#define XCreateFontSet XCREATEFONTSET
-#define XCreateGC XCREATEGC
-#define XCreateIC XCREATEIC
-#define XCreateImage XCREATEIMAGE
-#define XCreatePixmap XCREATEPIXMAP
-#define XCreatePixmapCursor XCREATEPIXMAPCURSOR
-#define XCreatePixmapFromBitmapData XCREATEPIXMAPFROMBITMAPDATA
-#define XCreateRegion XCREATEREGION
-#define XCreateSimpleWindow XCREATESIMPLEWINDOW
-#define XCreateWindow XCREATEWINDOW
-#define XDefaultScreenOfDisplay XDEFAULTSCREENOFDISPLAY
-#define XDefineCursor XDEFINECURSOR
-#define XDeleteProperty XDELETEPROPERTY
-#define XDestroyIC XDESTROYIC
-#define XDestroyRegion XDESTROYREGION
-#define XDestroyWindow XDESTROYWINDOW
-#define XDisplayName XDISPLAYNAME
-#define XDisplayOfScreen XDISPLAYOFSCREEN
-#define XDrawArc XDRAWARC
-#define XDrawImageString XDRAWIMAGESTRING
-#define XDrawImageString16 XDRAWIMAGESTRING16
-#define XDrawLine XDRAWLINE
-#define XDrawLines XDRAWLINES
-#define XDrawPoint XDRAWPOINT
-#define XDrawPoints XDRAWPOINTS
-#define XDrawRectangle XDRAWRECTANGLE
-#define XDrawSegments XDRAWSEGMENTS
-#define XDrawString XDRAWSTRING
-#define XDrawString16 XDRAWSTRING16
-#define XEmptyRegion XEMPTYREGION
-#define XEqualRegion XEQUALREGION
-#define XEventsQueued XEVENTSQUEUED
-#define XExtentsOfFontSet XEXTENTSOFFONTSET
-#define XFillArc XFILLARC
-#define XFillPolygon XFILLPOLYGON
-#define XFillRectangle XFILLRECTANGLE
-#define XFillRectangles XFILLRECTANGLES
-#define XFilterEvent XFILTEREVENT
-#define XFlush XFLUSH
-#define XFontsOfFontSet XFONTSOFFONTSET
-#define XFree XFREE
-#define XFreeColormap XFREECOLORMAP
-#define XFreeColors XFREECOLORS
-#define XFreeCursor XFREECURSOR
-#define XFreeFont XFREEFONT
-#define XFreeFontInfo XFREEFONTINFO
-#define XFreeFontNames XFREEFONTNAMES
-#define XFreeFontSet XFREEFONTSET
-#define XFreeGC XFREEGC
-#define XFreeModifiermap XFREEMODIFIERMAP
-#define XFreePixmap XFREEPIXMAP
-#define XFreeStringList XFREESTRINGLIST
-#define XGetAtomName XGETATOMNAME
-#define XGetDefault XGETDEFAULT
-#define XGetErrorDatabaseText XGETERRORDATABASETEXT
-#define XGetErrorText XGETERRORTEXT
-#define XGetFontProperty XGETFONTPROPERTY
-#define XGetGCValues XGETGCVALUES
-#define XGetGeometry XGETGEOMETRY
-#define XGetICValues XGETICVALUES
-#define XGetIMValues XGETIMVALUES
-#define XGetImage XGETIMAGE
-#define XGetKeyboardControl XGETKEYBOARDCONTROL
-#define XGetModifierMapping XGETMODIFIERMAPPING
-#define XGetMotionEvents XGETMOTIONEVENTS
-#define XGetNormalHints XGETNORMALHINTS
-#define XGetSelectionOwner XGETSELECTIONOWNER
-#define XGetSubImage XGETSUBIMAGE
-#define XGetVisualInfo XGETVISUALINFO
-#define XGetWMColormapWindows XGETWMCOLORMAPWINDOWS
-#define XGetWMHints XGETWMHINTS
-#define XGetWMName XGETWMNAME
-#define XGetWMNormalHints XGETWMNORMALHINTS
-#define XGetWindowAttributes XGETWINDOWATTRIBUTES
-#define XGetWindowProperty XGETWINDOWPROPERTY
-#define XGrabKeyboard XGRABKEYBOARD
-#define XGrabPointer XGRABPOINTER
-#define XGrabServer XGRABSERVER
-#define XHeightOfScreen XHEIGHTOFSCREEN
-#define XIfEvent XIFEVENT
-#define XInternAtom XINTERNATOM
-#define XIntersectRegion XINTERSECTREGION
-#define XKeycodeToKeysym XKEYCODETOKEYSYM
-#define XKeysymToKeycode XKEYSYMTOKEYCODE
-#define XKeysymToString XKEYSYMTOSTRING
-#define XListFonts XLISTFONTS
-#define XListFontsWithInfo XLISTFONTSWITHINFO
-#define XListPixmapFormats XLISTPIXMAPFORMATS
-#define XListProperties XLISTPROPERTIES
-#define XLoadQueryFont XLOADQUERYFONT
-#define XLookupString XLOOKUPSTRING
-#define XLowerWindow XLOWERWINDOW
-#define XMapRaised XMAPRAISED
-#define XMapWindow XMAPWINDOW
-#define XMatchVisualInfo XMATCHVISUALINFO
-#define XMoveResizeWindow XMOVERESIZEWINDOW
-#define XMoveWindow XMOVEWINDOW
-#define XNextEvent XNEXTEVENT
-#define XOffsetRegion XOFFSETREGION
-#define XOpenDisplay XOPENDISPLAY
-#define XOpenIM XOPENIM
-#define XParseColor XPARSECOLOR
-#define XParseGeometry XPARSEGEOMETRY
-#define XPeekEvent XPEEKEVENT
-#define XPending XPENDING
-#define XPointInRegion XPOINTINREGION
-#define XPolygonRegion XPOLYGONREGION
-#define XPutBackEvent XPUTBACKEVENT
-#define XPutImage XPUTIMAGE
-#define XQueryColor XQUERYCOLOR
-#define XQueryColors XQUERYCOLORS
-#define XQueryExtension XQUERYEXTENSION
-#define XQueryPointer XQUERYPOINTER
-#define XQueryTree XQUERYTREE
-#define XRaiseWindow XRAISEWINDOW
-#define XReconfigureWMWindow XRECONFIGUREWMWINDOW
-#define XRectInRegion XRECTINREGION
-#define XRefreshKeyboardMapping XREFRESHKEYBOARDMAPPING
-#define XReparentWindow XREPARENTWINDOW
-#define XResizeWindow XRESIZEWINDOW
-#define XRestackWindows XRESTACKWINDOWS
-#define XRootWindowOfScreen XROOTWINDOWOFSCREEN
-#define XScreenNumberOfScreen XSCREENNUMBEROFSCREEN
-#define XSelectAsyncEvent XSELECTASYNCEVENT
-#define XSelectAsyncInput XSELECTASYNCINPUT
-#define XSelectInput XSELECTINPUT
-#define XSendEvent XSENDEVENT
-#define XServerVendor XSERVERVENDOR
-#define XSetBackground XSETBACKGROUND
-#define XSetClassHint XSETCLASSHINT
-#define XSetClipMask XSETCLIPMASK
-#define XSetClipOrigin XSETCLIPORIGIN
-#define XSetClipRectangles XSETCLIPRECTANGLES
-#define XSetCloseDownMode XSETCLOSEDOWNMODE
-#define XSetCommand XSETCOMMAND
-#define XSetDashes XSETDASHES
-#define XSetErrorHandler XSETERRORHANDLER
-#define XSetFillStyle XSETFILLSTYLE
-#define XSetFont XSETFONT
-#define XSetForeground XSETFOREGROUND
-#define XSetFunction XSETFUNCTION
-#define XSetGraphicsExposures XSETGRAPHICSEXPOSURES
-#define XSetICFocus XSETICFOCUS
-#define XSetICValues XSETICVALUES
-#define XSetIOErrorHandler XSETIOERRORHANDLER
-#define XSetInputFocus XSETINPUTFOCUS
-#define XSetLineAttributes XSETLINEATTRIBUTES
-#define XSetLocaleModifiers XSETLOCALEMODIFIERS
-#define XSetNormalHints XSETNORMALHINTS
-#define XSetRegion XSETREGION
-#define XSetSelectionOwner XSETSELECTIONOWNER
-#define XSetStipple XSETSTIPPLE
-#define XSetSubwindowMode XSETSUBWINDOWMODE
-#define XSetTSOrigin XSETTSORIGIN
-#define XSetTile XSETTILE
-#define XSetTransientForHint XSETTRANSIENTFORHINT
-#define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS
-#define XSetWMHints XSETWMHINTS
-#define XSetWMIconName XSETWMICONNAME
-#define XSetWMName XSETWMNAME
-#define XSetWMNormalHints XSETWMNORMALHINTS
-#define XSetWMProperties XSETWMPROPERTIES
-#define XSetWMProtocols XSETWMPROTOCOLS
-#define XSetWindowBackground XSETWINDOWBACKGROUND
-#define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
-#define XSetWindowColormap XSETWINDOWCOLORMAP
-#define XShapeCombineMask XSHAPECOMBINEMASK
-#define XShapeCombineRectangles XSHAPECOMBINERECTANGLES
-#define XShapeGetRectangles XSHAPEGETRECTANGLES
-#define XShrinkRegion XSHRINKREGION
-#define XStoreColor XSTORECOLOR
-#define XStoreColors XSTORECOLORS
-#define XStoreName XSTORENAME
-#define XStringToKeysym XSTRINGTOKEYSYM
-#define XSubtractRegion XSUBTRACTREGION
-#define XSupportsLocale XSUPPORTSLOCALE
-#define XSync XSYNC
-#define XSynchronize XSYNCHRONIZE
-#define XTextExtents XTEXTEXTENTS
-#define XTextExtents16 XTEXTEXTENTS16
-#define XTextWidth XTEXTWIDTH
-#define XTextWidth16 XTEXTWIDTH16
-#define XTranslateCoordinates XTRANSLATECOORDINATES
-#define XUndefineCursor XUNDEFINECURSOR
-#define XUngrabKeyboard XUNGRABKEYBOARD
-#define XUngrabPointer XUNGRABPOINTER
-#define XUngrabServer XUNGRABSERVER
-#define XUnionRectWithRegion XUNIONRECTWITHREGION
-#define XUnionRegion XUNIONREGION
-#define XUnmapWindow XUNMAPWINDOW
-#define _XUnregisterFilter _XUNREGISTERFILTER
-#define XUnsetICFocus XUNSETICFOCUS
-#define XVaCreateNestedList XVACREATENESTEDLIST
-#define XVisualIDFromVisual XVISUALIDFROMVISUAL
-#define XWidthOfScreen XWIDTHOFSCREEN
-#define XWindowEvent XWINDOWEVENT
-#define XWithdrawWindow XWITHDRAWWINDOW
-#define XXorRegion XXORREGION
-#define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
-#define XmAddProtocols XMADDPROTOCOLS
-#define XmChangeColor XMCHANGECOLOR
-#define XmClipboardCopy XMCLIPBOARDCOPY
-#define XmClipboardEndCopy XMCLIPBOARDENDCOPY
-#define XmClipboardInquireLength XMCLIPBOARDINQUIRELENGTH
-#define XmClipboardLock XMCLIPBOARDLOCK
-#define XmClipboardRetrieve XMCLIPBOARDRETRIEVE
-#define XmClipboardStartCopy XMCLIPBOARDSTARTCOPY
-#define XmClipboardUnlock XMCLIPBOARDUNLOCK
-#define XmCreateArrowButton XMCREATEARROWBUTTON
-#define XmCreateArrowButtonGadget XMCREATEARROWBUTTONGADGET
-#define XmCreateCascadeButton XMCREATECASCADEBUTTON
-#define XmCreateDialogShell XMCREATEDIALOGSHELL
-#define XmCreateDragIcon XMCREATEDRAGICON
-#define XmCreateDrawingArea XMCREATEDRAWINGAREA
-#define XmCreateDrawnButton XMCREATEDRAWNBUTTON
-#define XmCreateFileSelectionBox XMCREATEFILESELECTIONBOX
-#define XmCreateFileSelectionDialog XMCREATEFILESELECTIONDIALOG
-#define XmCreateForm XMCREATEFORM
-#define XmCreateFormDialog XMCREATEFORMDIALOG
-#define XmCreateFrame XMCREATEFRAME
-#define XmCreateInformationDialog XMCREATEINFORMATIONDIALOG
-#define XmCreateLabelGadget XMCREATELABELGADGET
-#define XmCreateMainWindow XMCREATEMAINWINDOW
-#define XmCreateMenuBar XMCREATEMENUBAR
-#define XmCreateMessageBox XMCREATEMESSAGEBOX
-#define XmCreateMessageDialog XMCREATEMESSAGEDIALOG
-#define XmCreateOptionMenu XMCREATEOPTIONMENU
-#define XmCreatePanedWindow XMCREATEPANEDWINDOW
-#define XmCreatePopupMenu XMCREATEPOPUPMENU
-#define XmCreatePromptDialog XMCREATEPROMPTDIALOG
-#define XmCreatePulldownMenu XMCREATEPULLDOWNMENU
-#define XmCreatePushButton XMCREATEPUSHBUTTON
-#define XmCreatePushButtonGadget XMCREATEPUSHBUTTONGADGET
-#define XmCreateQuestionDialog XMCREATEQUESTIONDIALOG
-#define XmCreateRadioBox XMCREATERADIOBOX
-#define XmCreateRowColumn XMCREATEROWCOLUMN
-#define XmCreateScale XMCREATESCALE
-#define XmCreateScrollBar XMCREATESCROLLBAR
-#define XmCreateScrolledList XMCREATESCROLLEDLIST
-#define XmCreateScrolledText XMCREATESCROLLEDTEXT
-#define XmCreateScrolledWindow XMCREATESCROLLEDWINDOW
-#define XmCreateSelectionDialog XMCREATESELECTIONDIALOG
-#define XmCreateSeparator XMCREATESEPARATOR
-#define XmCreateSeparatorGadget XMCREATESEPARATORGADGET
-#define XmCreateTemplateDialog XMCREATETEMPLATEDIALOG
-#define XmCreateText XMCREATETEXT
-#define XmCreateTextField XMCREATETEXTFIELD
-#define XmCreateToggleButton XMCREATETOGGLEBUTTON
-#define XmCreateToggleButtonGadget XMCREATETOGGLEBUTTONGADGET
-#define XmDragStart XMDRAGSTART
-#define XmDropSiteRegister XMDROPSITEREGISTER
-#define XmDropSiteUnregister XMDROPSITEUNREGISTER
-#define XmDropSiteUpdate XMDROPSITEUPDATE
-#define XmDropTransferStart XMDROPTRANSFERSTART
-#define XmFileSelectionBoxGetChild XMFILESELECTIONBOXGETCHILD
-#define XmFileSelectionDoSearch XMFILESELECTIONDOSEARCH
-#define XmFontListAppendEntry XMFONTLISTAPPENDENTRY
-#define XmFontListCopy XMFONTLISTCOPY
-#define XmFontListCreate XMFONTLISTCREATE
-#define XmFontListEntryCreate XMFONTLISTENTRYCREATE
-#define XmFontListEntryFree XMFONTLISTENTRYFREE
-#define XmFontListEntryGetFont XMFONTLISTENTRYGETFONT
-#define XmFontListEntryGetTag XMFONTLISTENTRYGETTAG
-#define XmFontListEntryLoad XMFONTLISTENTRYLOAD
-#define XmFontListFree XMFONTLISTFREE
-#define XmFontListFreeFontContext XMFONTLISTFREEFONTCONTEXT
-#define XmFontListGetNextFont XMFONTLISTGETNEXTFONT
-#define XmFontListInitFontContext XMFONTLISTINITFONTCONTEXT
-#define XmFontListNextEntry XMFONTLISTNEXTENTRY
-#define XmGetColors XMGETCOLORS
-#define XmGetFocusWidget XMGETFOCUSWIDGET
-#define XmGetMenuCursor XMGETMENUCURSOR
-#define XmGetPixmapByDepth XMGETPIXMAPBYDEPTH
-#define XmGetTearOffControl XMGETTEAROFFCONTROL
-#define XmGetXmDisplay XMGETXMDISPLAY
-#define XmImMbLookupString XMIMMBLOOKUPSTRING
-#define XmImRegister XMIMREGISTER
-#define XmImSetFocusValues XMIMSETFOCUSVALUES
-#define XmImSetValues XMIMSETVALUES
-#define XmImUnregister XMIMUNREGISTER
-#define XmImUnsetFocus XMIMUNSETFOCUS
-#define XmInternAtom XMINTERNATOM
-#define XmIsMotifWMRunning XMISMOTIFWMRUNNING
-#define XmListAddItem XMLISTADDITEM
-#define XmListAddItemUnselected XMLISTADDITEMUNSELECTED
-#define XmListAddItemsUnselected XMLISTADDITEMSUNSELECTED
-#define XmListDeleteAllItems XMLISTDELETEALLITEMS
-#define XmListDeleteItemsPos XMLISTDELETEITEMSPOS
-#define XmListDeletePos XMLISTDELETEPOS
-#define XmListDeselectAllItems XMLISTDESELECTALLITEMS
-#define XmListDeselectPos XMLISTDESELECTPOS
-#define XmListGetKbdItemPos XMLISTGETKBDITEMPOS
-#define XmListGetMatchPos XMLISTGETMATCHPOS
-#define XmListGetSelectedPos XMLISTGETSELECTEDPOS
-#define XmListPosSelected XMLISTPOSSELECTED
-#define XmListSelectItem XMLISTSELECTITEM
-#define XmListSelectPos XMLISTSELECTPOS
-#define XmListSetBottomPos XMLISTSETBOTTOMPOS
-#define XmListSetItem XMLISTSETITEM
-#define XmListSetKbdItemPos XMLISTSETKBDITEMPOS
-#define XmListSetPos XMLISTSETPOS
-#define XmMainWindowSetAreas XMMAINWINDOWSETAREAS
-#define XmMenuPosition XMMENUPOSITION
-#define XmMessageBoxGetChild XMMESSAGEBOXGETCHILD
-#define XmOptionButtonGadget XMOPTIONBUTTONGADGET
-#define XmOptionLabelGadget XMOPTIONLABELGADGET
-#define XmProcessTraversal XMPROCESSTRAVERSAL
-#define XmQmotif XMQMOTIF
-#define XmRemoveProtocolCallback XMREMOVEPROTOCOLCALLBACK
-#define XmRepTypeGetId XMREPTYPEGETID
-#define XmRepTypeGetRecord XMREPTYPEGETRECORD
-#define XmRepTypeRegister XMREPTYPEREGISTER
-#define XmRepTypeValidValue XMREPTYPEVALIDVALUE
-#define XmScrollBarSetValues XMSCROLLBARSETVALUES
-#define XmScrolledWindowSetAreas XMSCROLLEDWINDOWSETAREAS
-#define XmSelectionBoxGetChild XMSELECTIONBOXGETCHILD
-#define XmStringByteCompare XMSTRINGBYTECOMPARE
-#define XmStringCompare XMSTRINGCOMPARE
-#define XmStringConcat XMSTRINGCONCAT
-#define XmStringCopy XMSTRINGCOPY
-#define XmStringCreate XMSTRINGCREATE
-#define XmStringCreateLocalized XMSTRINGCREATELOCALIZED
-#define XmStringCreateLtoR XMSTRINGCREATELTOR
-#define XmStringCreateSimple XMSTRINGCREATESIMPLE
-#define XmStringDraw XMSTRINGDRAW
-#define XmStringDrawUnderline XMSTRINGDRAWUNDERLINE
-#define XmStringExtent XMSTRINGEXTENT
-#define XmStringFree XMSTRINGFREE
-#define XmStringFreeContext XMSTRINGFREECONTEXT
-#define XmStringGetLtoR XMSTRINGGETLTOR
-#define XmStringGetNextComponent XMSTRINGGETNEXTCOMPONENT
-#define XmStringGetNextSegment XMSTRINGGETNEXTSEGMENT
-#define XmStringInitContext XMSTRINGINITCONTEXT
-#define XmStringLength XMSTRINGLENGTH
-#define XmStringLtoRCreate XMSTRINGLTORCREATE
-#define XmStringNConcat XMSTRINGNCONCAT
-#define XmStringSegmentCreate XMSTRINGSEGMENTCREATE
-#define XmStringWidth XMSTRINGWIDTH
-#define XmTextClearSelection XMTEXTCLEARSELECTION
-#define XmTextFieldGetEditable XMTEXTFIELDGETEDITABLE
-#define XmTextFieldGetInsertionPosition XMTEXTFIELDGETINSERTIONPOSITION
-#define XmTextFieldGetLastPosition XMTEXTFIELDGETLASTPOSITION
-#define XmTextFieldGetSelection XMTEXTFIELDGETSELECTION
-#define XmTextFieldGetString XMTEXTFIELDGETSTRING
-#define XmTextFieldInsert XMTEXTFIELDINSERT
-#define XmTextFieldRemove XMTEXTFIELDREMOVE
-#define XmTextFieldSetSelection XMTEXTFIELDSETSELECTION
-#define XmTextFieldSetString XMTEXTFIELDSETSTRING
-#define XmTextGetCursorPosition XMTEXTGETCURSORPOSITION
-#define XmTextGetInsertionPosition XMTEXTGETINSERTIONPOSITION
-#define XmTextGetLastPosition XMTEXTGETLASTPOSITION
-#define XmTextGetMaxLength XMTEXTGETMAXLENGTH
-#define XmTextGetSelection XMTEXTGETSELECTION
-#define XmTextGetSelectionPosition XMTEXTGETSELECTIONPOSITION
-#define XmTextGetString XMTEXTGETSTRING
-#define XmTextInsert XMTEXTINSERT
-#define XmTextRemove XMTEXTREMOVE
-#define XmTextReplace XMTEXTREPLACE
-#define XmTextSetCursorPosition XMTEXTSETCURSORPOSITION
-#define XmTextSetHighlight XMTEXTSETHIGHLIGHT
-#define XmTextSetInsertionPosition XMTEXTSETINSERTIONPOSITION
-#define XmTextSetSelection XMTEXTSETSELECTION
-#define XmTextSetString XMTEXTSETSTRING
-#define XmToggleButtonGadgetGetState XMTOGGLEBUTTONGADGETGETSTATE
-#define XmToggleButtonGadgetSetState XMTOGGLEBUTTONGADGETSETSTATE
-#define XmToggleButtonGetState XMTOGGLEBUTTONGETSTATE
-#define XmToggleButtonSetState XMTOGGLEBUTTONSETSTATE
-#define XmUpdateDisplay XMUPDATEDISPLAY
-#define XmVaCreateSimpleRadioBox XMVACREATESIMPLERADIOBOX
-#define XmbDrawString XMBDRAWSTRING
-#define XmbLookupString XMBLOOKUPSTRING
-#define XmbResetIC XMBRESETIC
-#define XmbSetWMProperties XMBSETWMPROPERTIES
-#define XmbTextEscapement XMBTEXTESCAPEMENT
-#define XmbTextExtents XMBTEXTEXTENTS
-#define XmbTextListToTextProperty XMBTEXTLISTTOTEXTPROPERTY
-#define XmbTextPropertyToTextList XMBTEXTPROPERTYTOTEXTLIST
-#define XmuClientWindow XMUCLIENTWINDOW
-#define XmuPrintDefaultErrorMessage XMUPRINTDEFAULTERRORMESSAGE
-#define XrmGetDatabase XRMGETDATABASE
-#define XrmGetResource XRMGETRESOURCE
-#define XrmPutStringResource XRMPUTSTRINGRESOURCE
-#define XrmQuarkToString XRMQUARKTOSTRING
-#define XrmStringToQuark XRMSTRINGTOQUARK
-#define XtAddCallback XTADDCALLBACK
-#define XtAddCallbacks XTADDCALLBACKS
-#define XtAddEventHandler XTADDEVENTHANDLER
-#define XtAddGrab XTADDGRAB
-#define XtAllocateGC XTALLOCATEGC
-#define XtAppAddActions XTAPPADDACTIONS
-#define XtAppAddInput XTAPPADDINPUT
-#define XtAppAddTimeOut XTAPPADDTIMEOUT
-#define XtAppCreateShell XTAPPCREATESHELL
-#define XtAppInitialize XTAPPINITIALIZE
-#define XtAppNextEvent XTAPPNEXTEVENT
-#define XtAppPeekEvent XTAPPPEEKEVENT
-#define XtAppPending XTAPPPENDING
-#define XtAppProcessEvent XTAPPPROCESSEVENT
-#define XtAppSetErrorHandler XTAPPSETERRORHANDLER
-#define XtAppSetFallbackResources XTAPPSETFALLBACKRESOURCES
-#define XtAppSetWarningHandler XTAPPSETWARNINGHANDLER
-#define XtAppSetWarningMsgHandler XTAPPSETWARNINGMSGHANDLER
-#define XtAppWarning XTAPPWARNING
-#define XtCallActionProc XTCALLACTIONPROC
-#define XtCallCallbackList XTCALLCALLBACKLIST
-#define XtCallCallbacks XTCALLCALLBACKS
-#define XtConfigureWidget XTCONFIGUREWIDGET
-#define XtConvertAndStore XTCONVERTANDSTORE
-#define XtCreateApplicationContext XTCREATEAPPLICATIONCONTEXT
-#define XtCreateManagedWidget XTCREATEMANAGEDWIDGET
-#define XtCreatePopupShell XTCREATEPOPUPSHELL
-#define XtCreateWidget XTCREATEWIDGET
-#define XtDatabase XTDATABASE
-#define XtDestroyWidget XTDESTROYWIDGET
-#define XtDisownSelection XTDISOWNSELECTION
-#define XtDispatchEvent XTDISPATCHEVENT
-#define XtDisplayOfObject XTDISPLAYOFOBJECT
-#define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING
-#define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT
-#define XtAppAddWorkProc XTAPPADDWORKPROC
-#define XtRemoveWorkProc XTREMOVEWORKPROC
-#define XtFree XTFREE
-#define XtGetActionKeysym XTGETACTIONKEYSYM
-#define XtGetActionList XTGETACTIONLIST
-#define XtGetApplicationNameAndClass XTGETAPPLICATIONNAMEANDCLASS
-#define XtGetApplicationResources XTGETAPPLICATIONRESOURCES
-#define XtGetGC XTGETGC
-#define XtGetMultiClickTime XTGETMULTICLICKTIME
-#define XtGetSelectionValue XTGETSELECTIONVALUE
-#define XtGetSelectionValues XTGETSELECTIONVALUES
-#define XtGetSubresources XTGETSUBRESOURCES
-#define XtGetValues XTGETVALUES
-#define XtGrabKeyboard XTGRABKEYBOARD
-#define XtGrabPointer XTGRABPOINTER
-#define XtHasCallbacks XTHASCALLBACKS
-#define XtInitializeWidgetClass XTINITIALIZEWIDGETCLASS
-#define XtInsertEventHandler XTINSERTEVENTHANDLER
-#define XtIsManaged XTISMANAGED
-#define XtIsObject XTISOBJECT
-#define XtIsSensitive XTISSENSITIVE
-#define XtIsSubclass XTISSUBCLASS
-#define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED
-#define XtMakeGeometryRequest XTMAKEGEOMETRYREQUEST
-#define XtMakeResizeRequest XTMAKERESIZEREQUEST
-#define XtMalloc XTMALLOC
-#define XtManageChild XTMANAGECHILD
-#define XtManageChildren XTMANAGECHILDREN
-#define XtMergeArgLists XTMERGEARGLISTS
-#define XtMoveWidget XTMOVEWIDGET
-#define XtName XTNAME
-#define XtNameToWidget XTNAMETOWIDGET
-#define XtOpenDisplay XTOPENDISPLAY
-#define XtOverrideTranslations XTOVERRIDETRANSLATIONS
-#define XtOwnSelection XTOWNSELECTION
-#define XtParseTranslationTable XTPARSETRANSLATIONTABLE
-#define XtPopdown XTPOPDOWN
-#define XtPopup XTPOPUP
-#define XtQueryGeometry XTQUERYGEOMETRY
-#define XtRealizeWidget XTREALIZEWIDGET
-#define XtRealloc XTREALLOC
-#define XtReleaseGC XTRELEASEGC
-#define XtRemoveAllCallbacks XTREMOVEALLCALLBACKS
-#define XtRemoveCallback XTREMOVECALLBACK
-#define XtRemoveEventHandler XTREMOVEEVENTHANDLER
-#define XtRemoveGrab XTREMOVEGRAB
-#define XtRemoveInput XTREMOVEINPUT
-#define XtRemoveTimeOut XTREMOVETIMEOUT
-#define XtResizeWidget XTRESIZEWIDGET
-#define XtResolvePathname XTRESOLVEPATHNAME
-#define XtSetKeyboardFocus XTSETKEYBOARDFOCUS
-#define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED
-#define XtSetSensitive XTSETSENSITIVE
-#define XtSetTypeConverter XTSETTYPECONVERTER
-#define XtSetValues XTSETVALUES
-#define XtShellStrings XTSHELLSTRINGS
-#define XtStrings XTSTRINGS
-#define XtToolkitInitialize XTTOOLKITINITIALIZE
-#define XtTranslateCoords XTTRANSLATECOORDS
-#define XtTranslateKeycode XTTRANSLATEKEYCODE
-#define XtUngrabKeyboard XTUNGRABKEYBOARD
-#define XtUngrabPointer XTUNGRABPOINTER
-#define XtUnmanageChild XTUNMANAGECHILD
-#define XtUnmanageChildren XTUNMANAGECHILDREN
-#define XtUnrealizeWidget XTUNREALIZEWIDGET
-#define XtVaCreateManagedWidget XTVACREATEMANAGEDWIDGET
-#define XtVaCreateWidget XTVACREATEWIDGET
-#define XtVaGetValues XTVAGETVALUES
-#define XtVaSetValues XTVASETVALUES
-#define XtWarning XTWARNING
-#define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT
-#define XtWindowOfObject XTWINDOWOFOBJECT
-#define XtWindowToWidget XTWINDOWTOWIDGET
-#define XwcDrawString XWCDRAWSTRING
-#define XwcFreeStringList XWCFREESTRINGLIST
-#define XwcTextEscapement XWCTEXTESCAPEMENT
-#define XwcTextExtents XWCTEXTEXTENTS
-#define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY
-#define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST
-#define _XmBottomShadowColorDefault _XMBOTTOMSHADOWCOLORDEFAULT
-#define _XmClearBorder _XMCLEARBORDER
-#define _XmConfigureObject _XMCONFIGUREOBJECT
-#define _XmDestroyParentCallback _XMDESTROYPARENTCALLBACK
-#define _XmDrawArrow _XMDRAWARROW
-#define _XmDrawShadows _XMDRAWSHADOWS
-#define _XmFontListGetDefaultFont _XMFONTLISTGETDEFAULTFONT
-#define _XmFromHorizontalPixels _XMFROMHORIZONTALPIXELS
-#define _XmFromVerticalPixels _XMFROMVERTICALPIXELS
-#define _XmGetClassExtensionPtr _XMGETCLASSEXTENSIONPTR
-#define _XmGetDefaultFontList _XMGETDEFAULTFONTLIST
-#define _XmGetTextualDragIcon _XMGETTEXTUALDRAGICON
-#define _XmGetWidgetExtData _XMGETWIDGETEXTDATA
-#define _XmGrabKeyboard _XMGRABKEYBOARD
-#define _XmGrabPointer _XMGRABPOINTER
-#define _XmInheritClass _XMINHERITCLASS
-#define _XmInputInGadget _XMINPUTINGADGET
-#define _XmMakeGeometryRequest _XMMAKEGEOMETRYREQUEST
-#define _XmMenuPopDown _XMMENUPOPDOWN
-#define _XmMoveObject _XMMOVEOBJECT
-#define _XmNavigChangeManaged _XMNAVIGCHANGEMANAGED
-#define _XmOSBuildFileList _XMOSBUILDFILELIST
-#define _XmOSFileCompare _XMOSFILECOMPARE
-#define _XmOSFindPatternPart _XMOSFINDPATTERNPART
-#define _XmOSQualifyFileSpec _XMOSQUALIFYFILESPEC
-#define _XmPostPopupMenu _XMPOSTPOPUPMENU
-#define _XmPrimitiveEnter _XMPRIMITIVEENTER
-#define _XmPrimitiveLeave _XMPRIMITIVELEAVE
-#define _XmRedisplayGadgets _XMREDISPLAYGADGETS
-#define _XmShellIsExclusive _XMSHELLISEXCLUSIVE
-#define _XmStringDraw _XMSTRINGDRAW
-#define _XmStringGetTextConcat _XMSTRINGGETTEXTCONCAT
-#define _XmStrings _XMSTRINGS
-#define _XmToHorizontalPixels _XMTOHORIZONTALPIXELS
-#define _XmToVerticalPixels _XMTOVERTICALPIXELS
-#define _XmTopShadowColorDefault _XMTOPSHADOWCOLORDEFAULT
-#define _Xm_fastPtr _XM_FASTPTR
-#define _XtCheckSubclassFlag _XTCHECKSUBCLASSFLAG
-#define _XtInherit _XTINHERIT
-#define _XtInheritTranslations _XTINHERITTRANSLATIONS
-#define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS
-#define compositeWidgetClass COMPOSITEWIDGETCLASS
-#define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS
-#define shellWidgetClass SHELLWIDGETCLASS
-#define topLevelShellClassRec TOPLEVELSHELLCLASSREC
-#define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS
-#define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS
-#define vendorShellClassRec VENDORSHELLCLASSREC
-#define vendorShellWidgetClass VENDORSHELLWIDGETCLASS
-#define wmShellWidgetClass WMSHELLWIDGETCLASS
-#define xmArrowButtonWidgetClass XMARROWBUTTONWIDGETCLASS
-#define xmCascadeButtonClassRec XMCASCADEBUTTONCLASSREC
-#define xmCascadeButtonGadgetClass XMCASCADEBUTTONGADGETCLASS
-#define xmCascadeButtonWidgetClass XMCASCADEBUTTONWIDGETCLASS
-#define xmDialogShellWidgetClass XMDIALOGSHELLWIDGETCLASS
-#define xmDrawingAreaWidgetClass XMDRAWINGAREAWIDGETCLASS
-#define xmDrawnButtonWidgetClass XMDRAWNBUTTONWIDGETCLASS
-#define xmFileSelectionBoxWidgetClass XMFILESELECTIONBOXWIDGETCLASS
-#define xmFormWidgetClass XMFORMWIDGETCLASS
-#define xmFrameWidgetClass XMFRAMEWIDGETCLASS
-#define xmGadgetClass XMGADGETCLASS
-#define xmLabelGadgetClass XMLABELGADGETCLASS
-#define xmLabelWidgetClass XMLABELWIDGETCLASS
-#define xmListWidgetClass XMLISTWIDGETCLASS
-#define xmMainWindowWidgetClass XMMAINWINDOWWIDGETCLASS
-#define xmManagerClassRec XMMANAGERCLASSREC
-#define xmManagerWidgetClass XMMANAGERWIDGETCLASS
-#define xmMenuShellWidgetClass XMMENUSHELLWIDGETCLASS
-#define xmMessageBoxWidgetClass XMMESSAGEBOXWIDGETCLASS
-#define xmPrimitiveClassRec XMPRIMITIVECLASSREC
-#define xmPrimitiveWidgetClass XMPRIMITIVEWIDGETCLASS
-#define xmPushButtonClassRec XMPUSHBUTTONCLASSREC
-#define xmPushButtonGadgetClass XMPUSHBUTTONGADGETCLASS
-#define xmPushButtonWidgetClass XMPUSHBUTTONWIDGETCLASS
-#define xmRowColumnWidgetClass XMROWCOLUMNWIDGETCLASS
-#define xmSashWidgetClass XMSASHWIDGETCLASS
-#define xmScrollBarWidgetClass XMSCROLLBARWIDGETCLASS
-#define xmScrolledWindowClassRec XMSCROLLEDWINDOWCLASSREC
-#define xmScrolledWindowWidgetClass XMSCROLLEDWINDOWWIDGETCLASS
-#define xmSeparatorGadgetClass XMSEPARATORGADGETCLASS
-#define xmSeparatorWidgetClass XMSEPARATORWIDGETCLASS
-#define xmTextFieldWidgetClass XMTEXTFIELDWIDGETCLASS
-#define xmTextWidgetClass XMTEXTWIDGETCLASS
-#define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
-#define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
-#define XtRegisterDrawable _XTREGISTERWINDOW
-#define XtUnregisterDrawable _XTUNREGISTERWINDOW
-#define XQueryFont XQUERYFONT
-#define XSetPlaneMask XSETPLANEMASK
-#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL
-#define XDestroySubwindows XDESTROYSUBWINDOWS
-#define XFreeDeviceList XFREEDEVICELIST
-#define XFreeDeviceState XFREEDEVICESTATE
-#define XGetExtensionVersion XGETEXTENSIONVERSION
-#define XGetRGBColormaps XGETRGBCOLORMAPS
-#define XIconifyWindow XICONIFYWINDOW
-#define XInstallColormap XINSTALLCOLORMAP
-#define XListInputDevices XLISTINPUTDEVICES
-#define XLookupKeysym XLOOKUPKEYSYM
-#define XOpenDevice XOPENDEVICE
-#define XQueryDeviceState XQUERYDEVICESTATE
-#define XSelectExtensionEvent XSELECTEXTENSIONEVENT
-#define XWarpPointer XWARPPOINTER
-#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP
-#define XAllocNamedColor XALLOCNAMEDCOLOR
-#define XBlackPixelOfScreen XBLACKPIXELOFSCREEN
-#define XDefaultColormap XDEFAULTCOLORMAP
-#define XDefaultColormapOfScreen XDEFAULTCOLORMAPOFSCREEN
-#define XDefaultDepth XDEFAULTDEPTH
-#define XDefaultScreen XDEFAULTSCREEN
-#define XDefaultVisual XDEFAULTVISUAL
-#define XSetIconName XSETICONNAME
-#define XtInitialize XTINITIALIZE
-#define XtMainLoop XTMAINLOOP
-#define DtSaverGetWindows DTSAVERGETWINDOWS
-#define XAddHosts XADDHOSTS
-#define XDisableAccessControl XDISABLEACCESSCONTROL
-#define XEnableAccessControl XENABLEACCESSCONTROL
-#define XFillArcs XFILLARCS
-#define XForceScreenSaver XFORCESCREENSAVER
-#define XGetScreenSaver XGETSCREENSAVER
-#define XListHosts XLISTHOSTS
-#define XReadBitmapFile XREADBITMAPFILE
-#define XRemoveHosts XREMOVEHOSTS
-#define XResetScreenSaver XRESETSCREENSAVER
-#define XResourceManagerString XRESOURCEMANAGERSTRING
-#define XSetScreenSaver XSETSCREENSAVER
-#define XStringListToTextProperty XSTRINGLISTTOTEXTPROPERTY
-#define XrmDestroyDatabase XRMDESTROYDATABASE
-#define XrmGetFileDatabase XRMGETFILEDATABASE
-#define XrmGetStringDatabase XRMGETSTRINGDATABASE
-#define XrmInitialize XRMINITIALIZE
-#define XrmMergeDatabases XRMMERGEDATABASES
-#define XrmParseCommand XRMPARSECOMMAND
-#define XrmPutLineResource XRMPUTLINERESOURCE
-#define XrmQPutStringResource XRMQPUTSTRINGRESOURCE
-#define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST
-#define XrmStringToQuark XRMSTRINGTOQUARK
-#define XmCreateLabel XMCREATELABEL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern void XtFree(char*);
-#ifdef __cplusplus
-}
-#endif
-
-#define pthread_attr_create PTHREAD_ATTR_CREATE
-#define pthread_attr_delete PTHREAD_ATTR_DELETE
-#define pthread_attr_destroy PTHREAD_ATTR_DESTROY
-#define pthread_attr_getdetach_np PTHREAD_ATTR_GETDETACH_NP
-#define pthread_attr_getguardsize_np PTHREAD_ATTR_GETGUARDSIZE_NP
-#define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED
-#define pthread_attr_getprio PTHREAD_ATTR_GETPRIO
-#define pthread_attr_getsched PTHREAD_ATTR_GETSCHED
-#define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM
-#define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE
-#define pthread_attr_init PTHREAD_ATTR_INIT
-#define pthread_attr_setdetach_np PTHREAD_ATTR_SETDETACH_NP
-#define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE
-#define pthread_attr_setguardsize_np PTHREAD_ATTR_SETGUARDSIZE_NP
-#define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED
-#define pthread_attr_setprio PTHREAD_ATTR_SETPRIO
-#define pthread_attr_setsched PTHREAD_ATTR_SETSCHED
-#define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM
-#define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY
-#define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE
-#define pthread_cancel PTHREAD_CANCEL
-#define pthread_cancel_e PTHREAD_CANCEL_E
-#define pthread_cond_broadcast PTHREAD_COND_BROADCAST
-#define pthread_cond_destroy PTHREAD_COND_DESTROY
-#define pthread_cond_init PTHREAD_COND_INIT
-#define pthread_cond_sig_preempt_int_np PTHREAD_COND_SIG_PREEMPT_INT_NP
-#define pthread_cond_signal PTHREAD_COND_SIGNAL
-#define pthread_cond_signal_int_np PTHREAD_COND_SIGNAL_INT_NP
-#define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT
-#define pthread_cond_wait PTHREAD_COND_WAIT
-#define pthread_condattr_create PTHREAD_CONDATTR_CREATE
-#define pthread_condattr_delete PTHREAD_CONDATTR_DELETE
-#define pthread_condattr_init PTHREAD_CONDATTR_INIT
-#define pthread_create PTHREAD_CREATE
-#define pthread_delay_np PTHREAD_DELAY_NP
-#define pthread_detach PTHREAD_DETACH
-#define pthread_equal PTHREAD_EQUAL
-#define pthread_exc_fetch_fp_np PTHREAD_EXC_FETCH_FP_NP
-#define pthread_exc_handler_np PTHREAD_EXC_HANDLER_NP
-#define pthread_exc_pop_ctx_np PTHREAD_EXC_POP_CTX_NP
-#define pthread_exc_push_ctx_np PTHREAD_EXC_PUSH_CTX_NP
-#define pthread_exc_savecontext_np PTHREAD_EXC_SAVECONTEXT_NP
-#define pthread_exit PTHREAD_EXIT
-#define pthread_get_expiration_np PTHREAD_GET_EXPIRATION_NP
-#define pthread_getprio PTHREAD_GETPRIO
-#define pthread_getschedparam PTHREAD_GETSCHEDPARAM
-#define pthread_getscheduler PTHREAD_GETSCHEDULER
-#define pthread_getspecific PTHREAD_GETSPECIFIC
-#define pthread_getunique_np PTHREAD_GETUNIQUE_NP
-#define pthread_join PTHREAD_JOIN
-#define pthread_join32 PTHREAD_JOIN32
-#define pthread_keycreate PTHREAD_KEYCREATE
-#define pthread_key_create PTHREAD_KEY_CREATE
-#define pthread_kill PTHREAD_KILL
-#define pthread_lock_global_np PTHREAD_LOCK_GLOBAL_NP
-#define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY
-#define pthread_mutex_init PTHREAD_MUTEX_INIT
-#define pthread_mutex_lock PTHREAD_MUTEX_LOCK
-#define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK
-#define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK
-#define pthread_mutexattr_create PTHREAD_MUTEXATTR_CREATE
-#define pthread_mutexattr_delete PTHREAD_MUTEXATTR_DELETE
-#define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY
-#define pthread_mutexattr_getkind_np PTHREAD_MUTEXATTR_GETKIND_NP
-#define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT
-#define pthread_mutexattr_setkind_np PTHREAD_MUTEXATTR_SETKIND_NP
-#define pthread_mutexattr_settype_np PTHREAD_MUTEXATTR_SETTYPE_NP
-#define pthread_once PTHREAD_ONCE
-#define pthread_resume_np PTHREAD_RESUME_NP
-#define pthread_self PTHREAD_SELF
-#define pthread_setasynccancel PTHREAD_SETASYNCCANCEL
-#define pthread_setcancel PTHREAD_SETCANCEL
-#define pthread_setcancelstate PTHREAD_SETCANCELSTATE
-#define pthread_setprio PTHREAD_SETPRIO
-#define pthread_setschedparam PTHREAD_SETSCHEDPARAM
-#define pthread_setscheduler PTHREAD_SETSCHEDULER
-#define pthread_setspecific PTHREAD_SETSPECIFIC
-#define pthread_suspend_np PTHREAD_SUSPEND_NP
-#define pthread_testcancel PTHREAD_TESTCANCEL
-#define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP
-#define pthread_yield PTHREAD_YIELD
-#define pthread_yield_np PTHREAD_YIELD_NP
-#define XDefaultRootWindow XDEFAULTROOTWINDOW
-#define XDisplayCells XDISPLAYCELLS
-#define XMaxRequestSize XMAXREQUESTSIZE
-#define XScreenOfDisplay XSCREENOFDISPLAY
-#define XSetFillRule XSETFILLRULE
-#define XmActivateProtocol XMACTIVATEPROTOCOL
-#define XmCreateBulletinBoardDialog XMCREATEBULLETINBOARDDIALOG
-#define XmCreateErrorDialog XMCREATEERRORDIALOG
-#define XmCreateWarningDialog XMCREATEWARNINGDIALOG
-#define XmCvtCTToXmString XMCVTCTTOXMSTRING
-#define XmDestroyPixmap XMDESTROYPIXMAP
-#define XmGetPixmap XMGETPIXMAP
-#define XmInstallImage XMINSTALLIMAGE
-#define XmListAddItems XMLISTADDITEMS
-#define XmListDeleteItem XMLISTDELETEITEM
-#define XmListItemExists XMLISTITEMEXISTS
-#define XmListItemPos XMLISTITEMPOS
-#define XmListReplaceItems XMLISTREPLACEITEMS
-#define XmListReplaceItemsPos XMLISTREPLACEITEMSPOS
-#define XmRemoveProtocols XMREMOVEPROTOCOLS
-#define XmRemoveTabGroup XMREMOVETABGROUP
-#define XmSetColorCalculation XMSETCOLORCALCULATION
-#define XmTextCopy XMTEXTCOPY
-#define XmTextCut XMTEXTCUT
-#define XmTextFieldClearSelection XMTEXTFIELDCLEARSELECTION
-#define XmTextFieldCopy XMTEXTFIELDCOPY
-#define XmTextFieldCut XMTEXTFIELDCUT
-#define XmTextFieldGetMaxLength XMTEXTFIELDGETMAXLENGTH
-#define XmTextFieldGetSelectionPosition XMTEXTFIELDGETSELECTIONPOSITION
-#define XmTextFieldPaste XMTEXTFIELDPASTE
-#define XmTextFieldReplace XMTEXTFIELDREPLACE
-#define XmTextFieldSetAddMode XMTEXTFIELDSETADDMODE
-#define XmTextFieldSetHighlight XMTEXTFIELDSETHIGHLIGHT
-#define XmTextFieldSetInsertionPosition XMTEXTFIELDSETINSERTIONPOSITION
-#define XmTextFieldSetMaxLength XMTEXTFIELDSETMAXLENGTH
-#define XmTextFieldShowPosition XMTEXTFIELDSHOWPOSITION
-#define XmTextGetEditable XMTEXTGETEDITABLE
-#define XmTextPaste XMTEXTPASTE
-#define XmTextPosToXY XMTEXTPOSTOXY
-#define XmTextSetEditable XMTEXTSETEDITABLE
-#define XmTextShowPosition XMTEXTSHOWPOSITION
-#define XmUninstallImage XMUNINSTALLIMAGE
-#define XmuCvtStringToBitmap XMUCVTSTRINGTOBITMAP
-#define XrmPutFileDatabase XRMPUTFILEDATABASE
-#define XtAddConverter XTADDCONVERTER
-#define XtError XTERROR
-#define XtVaCreatePopupShell XTVACREATEPOPUPSHELL
-#define pthread_attr_getschedpolicy PTHREAD_ATTR_GETSCHEDPOLICY
-#define pthread_key_delete PTHREAD_KEY_DELETE
-#define xmBulletinBoardWidgetClass XMBULLETINBOARDWIDGETCLASS
-#define xmScaleWidgetClass XMSCALEWIDGETCLASS
-#define XtDisplay XTDISPLAY
-#define XtScreen XTSCREEN
-#define XAllocIconSize XALLOCICONSIZE
-#define XAllocStandardColormap XALLOCSTANDARDCOLORMAP
-#define XAllowEvents XALLOWEVENTS
-#define XBlackPixel XBLACKPIXEL
-#define XCopyColormapAndFree XCOPYCOLORMAPANDFREE
-#define XDefaultGC XDEFAULTGC
-#define XDisplayHeight XDISPLAYHEIGHT
-#define XDisplayWidth XDISPLAYWIDTH
-#define XGetCommand XGETCOMMAND
-#define XGetIconSizes XGETICONSIZES
-#define XKillClient XKILLCLIENT
-#define XListInstalledColormaps XLISTINSTALLEDCOLORMAPS
-#define XRootWindow XROOTWINDOW
-#define XWMGeometry XWMGEOMETRY
-#define XWhitePixel XWHITEPIXEL
-#define XrmCombineDatabase XRMCOMBINEDATABASE
-#define XrmCombineFileDatabase XRMCOMBINEFILEDATABASE
-#define XSetStandardProperties XSETSTANDARDPROPERTIES
-#define XSetState XSETSTATE
-#define XDrawRectangles XDRAWRECTANGLES
-#define XGrabButton XGRABBUTTON
-#define XLookupColor XLOOKUPCOLOR
-#define XMapSubwindows XMAPSUBWINDOWS
-#define XRecolorCursor XRECOLORCURSOR
-#define XStoreBytes XSTOREBYTES
-#define XUngrabButton XUNGRABBUTTON
-#define XUninstallColormap XUNINSTALLCOLORMAP
-#define lib$wait LIB$WAIT
-#define lib$find_file LIB$FIND_FILE
-#define lib$find_file_end LIB$FIND_FILE_END
-#define lib$set_symbol LIB$SET_SYMBOL
-#define lib$sfree1_dd LIB$SFREE1_DD
-#define lib$spawn LIB$SPAWN
-#define sys$assign SYS$ASSIGN
-#define sys$crembx SYS$CREMBX
-#define sys$dassgn SYS$DASSGN
-#define sys$dclexh SYS$DCLEXH
-#define sys$getdviw SYS$GETDVIW
-#define sys$getsyiw SYS$GETSYIW
-#define sys$qio SYS$QIO
-#define sys$qiow SYS$QIOW
-#define sys$setef SYS$SETEF
-#define sys$synch SYS$SYNCH
-#define XDrawText XDRAWTEXT
-#define XtCloseDisplay XTCLOSEDISPLAY
-#define XtDestroyApplicationContext XTDESTROYAPPLICATIONCONTEXT
-#define lib$ediv LIB$EDIV
-#define lib$subx LIB$SUBX
-#define sys$bintim SYS$BINTIM
-#define sys$gettim SYS$GETTIM
-#define XFetchName XFETCHNAME
-#define XPeekIfEvent XPEEKIFEVENT
-#define XQueryKeymap XQUERYKEYMAP
-#endif
diff --git a/nx-X11/extras/Mesa/include/GL/wmesa.h b/nx-X11/extras/Mesa/include/GL/wmesa.h
deleted file mode 100644
index 0a6e8b642..000000000
--- a/nx-X11/extras/Mesa/include/GL/wmesa.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  3.0
- * Copyright (C) 1995-1998  Brian Paul
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-
-/*
- * Windows driver by: Mark E. Peterson (markp@ic.mankato.mn.us)
- * Updated by Li Wei (liwei@aiar.xjtu.edu.cn)
- *
- *
- ***************************************************************
- *                     WMesa                                   *
- *                     version 2.3                             *	
- *                                                             *
- *                        By                                   *
- *                      Li Wei                                 *
- *       Institute of Artificial Intelligence & Robotics       *
- *       Xi'an Jiaotong University                             *
- *       Email: liwei@aiar.xjtu.edu.cn                         * 
- *       Web page: http://sun.aiar.xjtu.edu.cn                 *
- *                                                             *
- *	       July 7th, 1997				       *
- ***************************************************************
- */
-
-
-#ifndef WMESA_H
-#define WMESA_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include "GL/gl.h"
-
-#if defined(_MSV_VER) && !defined(__GNUC__)
-#  pragma warning (disable:4273)
-#  pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
-#  pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
-#  pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
-#  pragma warning( disable : 4013 ) /* 'function' undefined; assuming extern returning int */
-#  pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
-#  pragma warning( disable : 4273 ) /* 'identifier' : inconsistent DLL linkage. dllexport assumed */
-#  if (MESA_WARNQUIET>1)
-#    pragma warning( disable : 4146 ) /* unary minus operator applied to unsigned type, result still unsigned */
-#  endif
-#endif
-
-/*
- * This is the WMesa context 'handle':
- */
-typedef struct wmesa_context *WMesaContext;
-
-
-
-/*
- * Create a new WMesaContext for rendering into a window.  You must
- * have already created the window of correct visual type and with an
- * appropriate colormap.
- *
- * Input:
- *         hWnd - Window handle
- *         Pal  - Palette to use
- *         rgb_flag - GL_TRUE = RGB mode,
- *                    GL_FALSE = color index mode
- *         db_flag - GL_TRUE = double-buffered,
- *                   GL_FALSE = single buffered
- *         alpha_flag - GL_TRUE = create software alpha buffer,
- *                      GL_FALSE = no software alpha buffer
- *
- * Note: Indexed mode requires double buffering under Windows.
- *
- * Return:  a WMesa_context or NULL if error.
- */
-extern WMesaContext WMesaCreateContext(HWND hWnd,HPALETTE* pPal,
-                                       GLboolean rgb_flag,
-                                       GLboolean db_flag,
-                                       GLboolean alpha_flag);
-
-
-/*
- * Destroy a rendering context as returned by WMesaCreateContext()
- */
-/*extern void WMesaDestroyContext( WMesaContext ctx );*/
-extern void WMesaDestroyContext( void );
-
-
-
-/*
- * Make the specified context the current one.
- */
-extern void WMesaMakeCurrent( WMesaContext ctx );
-
-
-/*
- * Return a handle to the current context.
- */
-extern WMesaContext WMesaGetCurrentContext( void );
-
-
-/*
- * Swap the front and back buffers for the current context.  No action
- * taken if the context is not double buffered.
- */
-extern void WMesaSwapBuffers(void);
-
-
-/*
- * In indexed color mode we need to know when the palette changes.
- */
-extern void WMesaPaletteChange(HPALETTE Pal);
-
-extern void WMesaMove(void);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-
diff --git a/nx-X11/extras/Mesa/include/GL/xmesa_x.h b/nx-X11/extras/Mesa/include/GL/xmesa_x.h
deleted file mode 100644
index 1455c88ad..000000000
--- a/nx-X11/extras/Mesa/include/GL/xmesa_x.h
+++ /dev/null
@@ -1,84 +0,0 @@
-
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Kevin E. Martin <kevin@precisioninsight.com>
- *
- * When we're building the XMesa driver for stand-alone Mesa we
- * include this file when building the xm_*.c files.
- * We need to define some types and macros differently when building
- * in the Xserver vs. stand-alone Mesa.
- */
-
-#ifndef _XMESA_X_H_
-#define _XMESA_X_H_
-
-typedef Display      XMesaDisplay;
-typedef Pixmap       XMesaPixmap;
-typedef Colormap     XMesaColormap;
-typedef Drawable     XMesaDrawable;
-typedef Window       XMesaWindow;
-typedef GC           XMesaGC;
-typedef XVisualInfo *XMesaVisualInfo;
-typedef XImage       XMesaImage;
-typedef XPoint       XMesaPoint;
-typedef XColor       XMesaColor;
-
-#define XMesaDestroyImage      XDestroyImage
-
-#define XMesaPutPixel          XPutPixel
-#define XMesaGetPixel          XGetPixel
-
-#define XMesaSetForeground     XSetForeground
-#define XMesaSetBackground     XSetBackground
-#define XMesaSetPlaneMask      XSetPlaneMask
-#define XMesaSetFunction       XSetFunction
-#define XMesaSetFillStyle      XSetFillStyle
-#define XMesaSetTile           XSetTile
-
-#define XMesaDrawPoint         XDrawPoint
-#define XMesaDrawPoints        XDrawPoints
-#define XMesaFillRectangle     XFillRectangle
-#define XMesaPutImage          XPutImage
-#define XMesaCopyArea          XCopyArea
-
-#define XMesaCreatePixmap      XCreatePixmap
-#define XMesaFreePixmap        XFreePixmap
-#define XMesaFreeGC            XFreeGC
-
-#define GET_COLORMAP_SIZE(__v)  __v->visinfo->colormap_size
-#define GET_REDMASK(__v)        __v->mesa_visual.redMask
-#define GET_GREENMASK(__v)      __v->mesa_visual.greenMask
-#define GET_BLUEMASK(__v)       __v->mesa_visual.blueMask
-#define GET_VISUAL_DEPTH(__v)   __v->visinfo->depth
-#define GET_BLACK_PIXEL(__v)    BlackPixel(__v->display, __v->mesa_visual.screen)
-#define CHECK_BYTE_ORDER(__v)   host_byte_order()==ImageByteOrder(__v->display)
-#define CHECK_FOR_HPCR(__v)     XInternAtom(__v->display, "_HP_RGB_SMOOTH_MAP_LIST", True)
-
-#endif