[PATCH 07/18] Xcup: remove XCup.h library header, split into XCupconst.h

[Peter Hutterer]

---
 Makefile.am |    2 +-
 Xcup.h      |   69 -----------------------------------------------------------
 Xcupconst.h |   38 ++++++++++++++++++++++++++++++++
 Xcupstr.h   |    9 +++----
 4 files changed, 43 insertions(+), 75 deletions(-)
 delete mode 100644 Xcup.h
 create mode 100644 Xcupconst.h

diff --git a/Makefile.am b/Makefile.am
index c486043..17d94a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ xext_HEADERS = \
 	syncstr.h \
 	Xagconst.h \
 	Xagstr.h \
-	Xcup.h \
+	Xcupconst.h \
 	Xcupstr.h \
 	Xdbe.h \
 	Xdbeproto.h \
diff --git a/Xcup.h b/Xcup.h
deleted file mode 100644
index b1df039..0000000
--- a/Xcup.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $Xorg: Xcup.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-/*
-
-Copyright 1987, 1988, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice 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 NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86$ */
-
-#ifndef _XCUP_H_
-#define _XCUP_H_
-
-#include <X11/Xfuncproto.h>
-
-#define X_XcupQueryVersion			0
-#define X_XcupGetReservedColormapEntries	1
-#define X_XcupStoreColors			2
-
-#define XcupNumberErrors			0
-
-#ifndef _XCUP_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XcupQueryVersion(
-    Display*			/* dpy */,
-    int*			/* major_version */,
-    int*			/* minor_version */
-);
-
-Status XcupGetReservedColormapEntries(
-    Display*			/* dpy */,
-    int				/* screen */,
-    XColor**			/* colors_out */,
-    int*			/* ncolors */
-);
-
-Status XcupStoreColors(
-    Display*			/* dpy */,
-    Colormap			/* colormap */,
-    XColor*			/* colors */,
-    int				/* ncolors */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XCUP_SERVER_ */
-
-#endif /* _XCUP_H_ */
-
diff --git a/Xcupconst.h b/Xcupconst.h
new file mode 100644
index 0000000..a9abb98
--- /dev/null
+++ b/Xcupconst.h
@@ -0,0 +1,38 @@
+/* $Xorg: Xcup.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
+/*
+
+Copyright 1987, 1988, 1998  The Open Group
+
+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.
+
+The above copyright notice and this permission notice 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 NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+/* $XFree86$ */
+
+#ifndef _XCUPCONST_H_
+#define _XCUPCONST_H_
+
+#define XCUPNAME "TOG-CUP"
+
+#define XCUP_MAJOR_VERSION	1	/* current version numbers */
+#define XCUP_MINOR_VERSION	0
+
+#endif /* _XCUPCONST_H_ */
+
diff --git a/Xcupstr.h b/Xcupstr.h
index f521c33..c8f0798 100644
--- a/Xcupstr.h
+++ b/Xcupstr.h
@@ -30,12 +30,11 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XCUPSTR_H_ /* { */
 #define _XCUPSTR_H_
 
-#include <X11/extensions/Xcup.h>
+#define X_XcupQueryVersion			0
+#define X_XcupGetReservedColormapEntries	1
+#define X_XcupStoreColors			2
 
-#define XCUPNAME "TOG-CUP"
-
-#define XCUP_MAJOR_VERSION	1	/* current version numbers */
-#define XCUP_MINOR_VERSION	0
+#define XcupNumberErrors			0
 
 typedef struct _XcupQueryVersion {
     CARD8	reqType;	/* always XcupReqCode */
-- 
1.6.3.rc1.2.g0164.dirty