From 4146d1aa71ba5a2a4951667624844b4d3bff5c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 1 Nov 2016 21:30:22 +0100 Subject: Drop xf86glx.h, so we can finally drop Xserver/GL/include/ entirely. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Derived from X.org commit... commit 28b95fd9d1c2f078aaaac75c310a27b17c74a6fc Author: Kristian Høgsberg Date: Thu Jul 6 03:25:38 2006 -0400 Drop unused GL/include subtree. Woo, less Makefile's to generate. Backported-to-NX-by: Mike Gabriel --- .../extras/Mesa/src/mesa/drivers/x11/glxheader.h | 1 - nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h | 1 - nx-X11/programs/Xserver/GL/include/GL/xf86glx.h | 38 ---------------------- nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c | 1 - nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c | 1 - 5 files changed, 42 deletions(-) delete mode 100644 nx-X11/programs/Xserver/GL/include/GL/xf86glx.h diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h index 33d937f1c..6a1f2ed20 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h +++ b/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 diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h index 26255ae56..c5037e619 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h +++ b/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 diff --git a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h b/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h deleted file mode 100644 index 9e69fac65..000000000 --- a/nx-X11/programs/Xserver/GL/include/GL/xf86glx.h +++ /dev/null @@ -1,38 +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 - * - */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include "miscstruct.h" diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c index eae82f663..da0e77134 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c +++ b/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 #include "context.h" /* diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c index d0d8eb239..fad84ec7e 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c +++ b/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 -#include "GL/xf86glx.h" #ifdef ROUNDUP #undef ROUNDUP -- cgit v1.2.3