Drop xf86glx.h, so we can finally drop Xserver/GL/include/ entirely.

nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h

@@ -38,7 +38,6 @@
 # include "resource.h"
 # include "windowstr.h"
 # include "gcstruct.h"
-# include "GL/xf86glx.h"
 # include "xf86glx_util.h"
 
 #else

nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h

@@ -28,7 +28,6 @@
 
 
 #ifdef XFree86Server
-# include "GL/xf86glx.h"
 # include "xf86glx_util.h"
 #elif defined(USE_XSHM)
 # include <X11/extensions/XShm.h>

nx-X11/programs/Xserver/GL/include/GL/xf86glx.h

-/**************************************************************************
-
-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>
- *
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "miscstruct.h"

nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c

@@ -52,7 +52,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86glxint.h"
 #include "context.h"
 #include "xmesaP.h"
-#include <GL/xf86glx.h>
 #include "context.h"
 
 /*

nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c

@@ -41,7 +41,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "pixmapstr.h"
 #include "xf86glx_util.h"
 #include <nx-X11/Xmd.h>
-#include "GL/xf86glx.h"
 
 #ifdef ROUNDUP
 #undef ROUNDUP