diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2016-11-01 21:30:22 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:31:11 +0100 |
| commit | 4146d1aa71ba5a2a4951667624844b4d3bff5c0e (patch) | |
| tree | 0dff3bce8014269b766447a9474ffcaab3542467 /nx-X11/programs/Xserver | |
| parent | cee997dacb28aa9378b834b66a33c441145dceb7 (diff) | |
| download | nx-libs-4146d1aa71ba5a2a4951667624844b4d3bff5c0e.tar.gz nx-libs-4146d1aa71ba5a2a4951667624844b4d3bff5c0e.tar.bz2 nx-libs-4146d1aa71ba5a2a4951667624844b4d3bff5c0e.zip | |
Drop xf86glx.h, so we can finally drop Xserver/GL/include/ entirely.
Derived from X.org commit...
commit 28b95fd9d1c2f078aaaac75c310a27b17c74a6fc
Author: Kristian Høgsberg <krh@redhat.com>
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 <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/include/GL/xf86glx.h | 38 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c | 1 |
3 files changed, 0 insertions, 40 deletions
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 <kevin@precisioninsight.com> - * - */ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#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 <GL/xf86glx.h> #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 <nx-X11/Xmd.h> -#include "GL/xf86glx.h" #ifdef ROUNDUP #undef ROUNDUP |