Rename xcmiscstr.h to xcmiscproto.h for consistency with other modules.

A stub xcmiscstr.h is provided to avoid clients breaking.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

3 files changed, 114 insertions, 110 deletions

diff --git a/Makefile.am b/Makefile.am
index 4e04e92..e1827aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 xcmiscdir = $(includedir)/X11/extensions
 xcmisc_HEADERS = \
+	xcmiscproto.h \
 	xcmiscstr.h
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/xcmiscproto.h b/xcmiscproto.h
new file mode 100644
index 0000000..482c2dc
--- /dev/null
+++ b/xcmiscproto.h
@@ -0,0 +1,110 @@
+/*
+
+Copyright 1993, 1994, 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.
+
+*/
+
+#ifndef _XCMISCPROTO_H_
+#define _XCMISCPROTO_H_
+
+#define X_XCMiscGetVersion	0
+#define X_XCMiscGetXIDRange	1
+#define X_XCMiscGetXIDList	2
+
+#define XCMiscNumberEvents	0
+
+#define XCMiscNumberErrors	0
+
+#define XCMiscMajorVersion	1
+#define XCMiscMinorVersion	1
+
+#define XCMiscExtensionName	"XC-MISC"
+
+typedef struct {
+    CARD8	reqType;	/* always XCMiscCode */
+    CARD8	miscReqType;	/* always X_XCMiscGetVersion */
+    CARD16	length B16;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+} xXCMiscGetVersionReq;
+#define sz_xXCMiscGetVersionReq 8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;
+    CARD16	minorVersion B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXCMiscGetVersionReply;
+#define sz_xXCMiscGetVersionReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always XCMiscCode */
+    CARD8	miscReqType;	/* always X_XCMiscGetXIDRange */
+    CARD16	length B16;
+} xXCMiscGetXIDRangeReq;
+#define sz_xXCMiscGetXIDRangeReq 4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	start_id B32;
+    CARD32	count B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xXCMiscGetXIDRangeReply;
+#define sz_xXCMiscGetXIDRangeReply 32
+
+typedef struct {
+    CARD8	reqType;	/* always XCMiscCode */
+    CARD8	miscReqType;	/* always X_XCMiscGetXIDList */
+    CARD16	length B16;
+    CARD32	count B32;	/* number of IDs requested */
+} xXCMiscGetXIDListReq;
+#define sz_xXCMiscGetXIDListReq 8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad0;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	count B32;	/* number of IDs requested */
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXCMiscGetXIDListReply;
+#define sz_xXCMiscGetXIDListReply 32
+
+#endif /* _XCMISCPROTO_H_ */
diff --git a/xcmiscstr.h b/xcmiscstr.h
index 9a54e76..c2b6433 100644
--- a/xcmiscstr.h
+++ b/xcmiscstr.h
@@ -1,110 +1,3 @@
-/*
-
-Copyright 1993, 1994, 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.
-
-*/
-
-#ifndef _XCMISCSTR_H_
-#define _XCMISCSTR_H_
-
-#define X_XCMiscGetVersion	0
-#define X_XCMiscGetXIDRange	1
-#define X_XCMiscGetXIDList	2
-
-#define XCMiscNumberEvents	0
-
-#define XCMiscNumberErrors	0
-
-#define XCMiscMajorVersion	1
-#define XCMiscMinorVersion	1
-
-#define XCMiscExtensionName	"XC-MISC"
-
-typedef struct {
-    CARD8	reqType;	/* always XCMiscCode */
-    CARD8	miscReqType;	/* always X_XCMiscGetVersion */
-    CARD16	length B16;
-    CARD16	majorVersion B16;
-    CARD16	minorVersion B16;
-} xXCMiscGetVersionReq;
-#define sz_xXCMiscGetVersionReq 8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;
-    CARD16	minorVersion B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXCMiscGetVersionReply;
-#define sz_xXCMiscGetVersionReply 32
-
-typedef struct {
-    CARD8	reqType;	/* always XCMiscCode */
-    CARD8	miscReqType;	/* always X_XCMiscGetXIDRange */
-    CARD16	length B16;
-} xXCMiscGetXIDRangeReq;
-#define sz_xXCMiscGetXIDRangeReq 4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	start_id B32;
-    CARD32	count B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xXCMiscGetXIDRangeReply;
-#define sz_xXCMiscGetXIDRangeReply 32
-
-typedef struct {
-    CARD8	reqType;	/* always XCMiscCode */
-    CARD8	miscReqType;	/* always X_XCMiscGetXIDList */
-    CARD16	length B16;
-    CARD32	count B32;	/* number of IDs requested */
-} xXCMiscGetXIDListReq;
-#define sz_xXCMiscGetXIDListReq 8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	pad0;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	count B32;	/* number of IDs requested */
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXCMiscGetXIDListReply;
-#define sz_xXCMiscGetXIDListReply 32
-
-#endif /* _XCMISCSTR_H_ */
+#warning "xcmiscstr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/xcmiscproto.h> for the protocol defines."
+#include <X11/extensions/xcmiscproto.h>