Xserver/hw/nxagent: Drop NXcompositeext.h, it is a duplicate of…

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>
 

nx-X11/programs/Xserver/hw/nxagent/NXcompositeext.h

-/*
- * $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_ */