diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-07 00:54:44 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:39:26 +0200 |
| commit | 28acdaff7d0c34ecd9a783a87eeb09934f23a78e (patch) | |
| tree | 00dc9a1d6f43fc9c54544f8444c3e94513b06982 /nx-X11/programs | |
| parent | ca1e857108d412f618f35ed4a665732c809b3f60 (diff) | |
| download | nx-libs-28acdaff7d0c34ecd9a783a87eeb09934f23a78e.tar.gz nx-libs-28acdaff7d0c34ecd9a783a87eeb09934f23a78e.tar.bz2 nx-libs-28acdaff7d0c34ecd9a783a87eeb09934f23a78e.zip | |
Xserver/hw/nxagent: Drop NXcompositeext.h, it is a duplicate of nx-X11/include/extensions/composite.h.
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h | 9 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h | 55 |
2 files changed, 0 insertions, 64 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h b/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h index 5887ab24b..7ab7023ac 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h +++ b/nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h @@ -25,18 +25,9 @@ #ifndef _XCOMPOSITE_H_ #define _XCOMPOSITE_H_ -#ifdef NXAGENT_SERVER - #define XserverRegion XID -#include "NXcompositeext.h" - -#else - #include <nx-X11/extensions/composite.h> -#include "X11/include/Xfixes_nxagent.h" - -#endif #include <nx-X11/Xfuncproto.h> diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h deleted file mode 100644 index 38ac87e9b..000000000 --- a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * $Id: composite.h,v 1.4 2004/07/08 07:20:55 keithp Exp $ - * - * Copyright © 2003 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _COMPOSITE_H_ -#define _COMPOSITE_H_ - -#ifndef NXAGENT_SERVER - -#include <nx-X11/extensions/xfixeswire.h> - -#endif - -#define COMPOSITE_NAME "Composite" -#define COMPOSITE_MAJOR 0 -#define COMPOSITE_MINOR 4 - -#define CompositeRedirectAutomatic 0 -#define CompositeRedirectManual 1 - -#define X_CompositeQueryVersion 0 -#define X_CompositeRedirectWindow 1 -#define X_CompositeRedirectSubwindows 2 -#define X_CompositeUnredirectWindow 3 -#define X_CompositeUnredirectSubwindows 4 -#define X_CompositeCreateRegionFromBorderClip 5 -#define X_CompositeNameWindowPixmap 6 -#define X_CompositeGetOverlayWindow 7 -#define X_CompositeReleaseOverlayWindow 8 - -#define CompositeNumberRequests (X_CompositeReleaseOverlayWindow + 1) - -#define CompositeNumberEvents 0 - -#endif /* _COMPOSITE_H_ */ |