[PATCH 02/18] XEVI: remove XEVI.h library header, split into XEVIconst.h

[Peter Hutterer]

Remove Xlib function prototypes.
Move protocol opcodes to XEVIstr.h
Move extension name from XEVIstr.h into XEVIconst.h
---
 Makefile.am |    2 +-
 XEVI.h      |   64 -----------------------------------------------------------
 XEVIconst.h |   38 +++++++++++++++++++++++++++++++++++
 XEVIstr.h   |    6 +---
 4 files changed, 41 insertions(+), 69 deletions(-)
 delete mode 100644 XEVI.h
 create mode 100644 XEVIconst.h

diff --git a/Makefile.am b/Makefile.am
index 7d7fc37..b14a79a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ xext_HEADERS = \
 	Xcupstr.h \
 	Xdbe.h \
 	Xdbeproto.h \
-	XEVI.h \
+	XEVIconst.h \
 	XEVIstr.h \
 	Xext.h \
 	XLbx.h \
diff --git a/XEVI.h b/XEVI.h
deleted file mode 100644
index d8e37ff..0000000
--- a/XEVI.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $Xorg: XEVI.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
-/************************************************************
-Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, 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 Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS 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.
-********************************************************/
-/* $XFree86$ */
-
-#ifndef _XEVI_H_
-#define _XEVI_H_
-#include <X11/Xfuncproto.h>
-#define X_EVIQueryVersion		0
-#define X_EVIGetVisualInfo		1
-#define XEVI_TRANSPARENCY_NONE		0
-#define XEVI_TRANSPARENCY_PIXEL		1
-#define XEVI_TRANSPARENCY_MASK		2
-#ifndef _XEVI_SERVER_
-typedef struct {
-    VisualID		core_visual_id;
-    int			screen;
-    int			level;
-    unsigned int	transparency_type;
-    unsigned int	transparency_value;
-    unsigned int	min_hw_colormaps;
-    unsigned int	max_hw_colormaps;
-    unsigned int	num_colormap_conflicts;
-    VisualID*		colormap_conflicts;
-} ExtendedVisualInfo;
-_XFUNCPROTOBEGIN
-Bool XeviQueryExtension(
-    Display*            /* dpy */
-);
-Status XeviQueryVersion(
-    Display*		/* dpy */,
-    int*		/* majorVersion */,
-    int*		/* minorVersion */
-);
-Status XeviGetVisualInfo(
-    Display*		 	/* dpy */,
-    VisualID*			/* visual_query */,
-    int				/* nVisual_query */,
-    ExtendedVisualInfo**	/* extendedVisualInfo_return */,
-    int*			/* nInfo_return */
-);
-_XFUNCPROTOEND
-#endif
-#endif
diff --git a/XEVIconst.h b/XEVIconst.h
new file mode 100644
index 0000000..f7f760f
--- /dev/null
+++ b/XEVIconst.h
@@ -0,0 +1,38 @@
+/* $Xorg: XEVI.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
+/************************************************************
+Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, 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 Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS 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.
+********************************************************/
+/* $XFree86$ */
+
+#ifndef _XEVICONST_H_
+#define _XEVICONST_H_
+
+#define XEVI_TRANSPARENCY_NONE		0
+#define XEVI_TRANSPARENCY_PIXEL		1
+#define XEVI_TRANSPARENCY_MASK		2
+
+#define EVINAME "Extended-Visual-Information"
+
+#define XEVI_MAJOR_VERSION	1	/* current version numbers */
+#define XEVI_MINOR_VERSION	0
+
+#endif
diff --git a/XEVIstr.h b/XEVIstr.h
index 388ef4b..cf600e4 100644
--- a/XEVIstr.h
+++ b/XEVIstr.h
@@ -26,12 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _EVISTR_H_
 #define _EVISTR_H_
 
-#include <X11/extensions/XEVI.h>
+#define X_EVIQueryVersion		0
+#define X_EVIGetVisualInfo		1
 
 #define VisualID CARD32
-#define EVINAME "Extended-Visual-Information"
-#define XEVI_MAJOR_VERSION	1	/* current version numbers */
-#define XEVI_MINOR_VERSION	0
 
 typedef CARD32 VisualID32;
 #define sz_VisualID32 4
-- 
1.6.3.rc1.2.g0164.dirty