Rename xf86bigfstr.h to xf86bigfproto.h for consistency with other modules.

Leaving a stub xf86bigfstr.h in place to avoid clients breaking.

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

3 files changed, 97 insertions, 93 deletions

diff --git a/Makefile.am b/Makefile.am
index 491e87c..bc0af80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 xf86bigfontdir = $(includedir)/X11/extensions
 xf86bigfont_HEADERS = \
 	xf86bigfont.h \
+	xf86bigfproto.h \
 	xf86bigfstr.h
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/xf86bigfproto.h b/xf86bigfproto.h
new file mode 100644
index 0000000..14f5ac4
--- /dev/null
+++ b/xf86bigfproto.h
@@ -0,0 +1,93 @@
+/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */
+/*
+ * Declarations of request structures for the BIGFONT extension.
+ *
+ * Copyright (c) 1999-2000  Bruno Haible
+ * Copyright (c) 1999-2000  The XFree86 Project, Inc.
+ */
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD */
+
+#ifndef _XF86BIGFPROTO_H_
+#define _XF86BIGFPROTO_H_
+
+#include <X11/extensions/xf86bigfont.h>
+
+#define XF86BIGFONTNAME			"XFree86-Bigfont"
+
+#define XF86BIGFONT_MAJOR_VERSION	1	/* current version numbers */
+#define XF86BIGFONT_MINOR_VERSION	1
+
+typedef struct _XF86BigfontQueryVersion {
+    CARD8	reqType;		/* always XF86BigfontReqCode */
+    CARD8	xf86bigfontReqType;	/* always X_XF86BigfontQueryVersion */
+    CARD16	length B16;
+} xXF86BigfontQueryVersionReq;
+#define sz_xXF86BigfontQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	capabilities;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of XFree86-Bigfont */
+    CARD16	minorVersion B16;	/* minor version of XFree86-Bigfont */
+    CARD32	uid B32;
+    CARD32	gid B32;
+    CARD32	signature B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+} xXF86BigfontQueryVersionReply;
+#define sz_xXF86BigfontQueryVersionReply 32
+
+/* Bit masks that can be set in the capabilities */
+#define XF86Bigfont_CAP_LocalShm 1
+
+typedef struct _XF86BigfontQueryFont {
+    CARD8	reqType;		/* always XF86BigfontReqCode */
+    CARD8	xf86bigfontReqType;	/* always X_XF86BigfontQueryFont */
+    CARD16	length B16;
+    CARD32	id B32;
+    CARD32	flags B32;
+} xXF86BigfontQueryFontReq;
+#define sz_xXF86BigfontQueryFontReq	12
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    CARD8	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    xCharInfo	minBounds;
+#ifndef WORD64
+    CARD32	walign1 B32;
+#endif
+    xCharInfo	maxBounds;
+#ifndef WORD64
+    CARD32	walign2 B32;
+#endif
+    CARD16	minCharOrByte2 B16;
+    CARD16	maxCharOrByte2 B16;
+    CARD16	defaultChar B16;
+    CARD16	nFontProps B16;
+    CARD8	drawDirection;
+    CARD8	minByte1;
+    CARD8	maxByte1;
+    BOOL	allCharsExist;
+    INT16	fontAscent B16;
+    INT16	fontDescent B16;
+    CARD32	nCharInfos B32;
+    CARD32	nUniqCharInfos B32;
+    CARD32	shmid B32;
+    CARD32	shmsegoffset B32;
+    /* followed by nFontProps xFontProp structures */
+    /* and if nCharInfos > 0 && shmid == -1,
+       followed by nUniqCharInfos xCharInfo structures
+       and then by nCharInfos CARD16 indices (each >= 0, < nUniqCharInfos)
+       and then, if nCharInfos is odd, one more CARD16 for padding. */
+} xXF86BigfontQueryFontReply;
+#define sz_xXF86BigfontQueryFontReply	72
+
+/* Bit masks that can be set in the flags */
+#define XF86Bigfont_FLAGS_Shm 1
+
+#endif /* _XF86BIGFPROTO_H_ */
diff --git a/xf86bigfstr.h b/xf86bigfstr.h
index 7ba199b..cf6735d 100644
--- a/xf86bigfstr.h
+++ b/xf86bigfstr.h
@@ -1,93 +1,3 @@
-/* $XFree86: xc/include/extensions/xf86bigfstr.h,v 1.2 2000/02/29 03:09:00 dawes Exp $ */
-/*
- * Declarations of request structures for the BIGFONT extension.
- *
- * Copyright (c) 1999-2000  Bruno Haible
- * Copyright (c) 1999-2000  The XFree86 Project, Inc.
- */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#ifndef _XF86BIGFSTR_H_
-#define _XF86BIGFSTR_H_
-
-#include <X11/extensions/xf86bigfont.h>
-
-#define XF86BIGFONTNAME			"XFree86-Bigfont"
-
-#define XF86BIGFONT_MAJOR_VERSION	1	/* current version numbers */
-#define XF86BIGFONT_MINOR_VERSION	1
-
-typedef struct _XF86BigfontQueryVersion {
-    CARD8	reqType;		/* always XF86BigfontReqCode */
-    CARD8	xf86bigfontReqType;	/* always X_XF86BigfontQueryVersion */
-    CARD16	length B16;
-} xXF86BigfontQueryVersionReq;
-#define sz_xXF86BigfontQueryVersionReq	4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	capabilities;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of XFree86-Bigfont */
-    CARD16	minorVersion B16;	/* minor version of XFree86-Bigfont */
-    CARD32	uid B32;
-    CARD32	gid B32;
-    CARD32	signature B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-} xXF86BigfontQueryVersionReply;
-#define sz_xXF86BigfontQueryVersionReply 32
-
-/* Bit masks that can be set in the capabilities */
-#define XF86Bigfont_CAP_LocalShm 1
-
-typedef struct _XF86BigfontQueryFont {
-    CARD8	reqType;		/* always XF86BigfontReqCode */
-    CARD8	xf86bigfontReqType;	/* always X_XF86BigfontQueryFont */
-    CARD16	length B16;
-    CARD32	id B32;
-    CARD32	flags B32;
-} xXF86BigfontQueryFontReq;
-#define sz_xXF86BigfontQueryFontReq	12
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    CARD8	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    xCharInfo	minBounds;
-#ifndef WORD64
-    CARD32	walign1 B32;
-#endif
-    xCharInfo	maxBounds;
-#ifndef WORD64
-    CARD32	walign2 B32;
-#endif
-    CARD16	minCharOrByte2 B16;
-    CARD16	maxCharOrByte2 B16;
-    CARD16	defaultChar B16;
-    CARD16	nFontProps B16;
-    CARD8	drawDirection;
-    CARD8	minByte1;
-    CARD8	maxByte1;
-    BOOL	allCharsExist;
-    INT16	fontAscent B16;
-    INT16	fontDescent B16;
-    CARD32	nCharInfos B32;
-    CARD32	nUniqCharInfos B32;
-    CARD32	shmid B32;
-    CARD32	shmsegoffset B32;
-    /* followed by nFontProps xFontProp structures */
-    /* and if nCharInfos > 0 && shmid == -1,
-       followed by nUniqCharInfos xCharInfo structures
-       and then by nCharInfos CARD16 indices (each >= 0, < nUniqCharInfos)
-       and then, if nCharInfos is odd, one more CARD16 for padding. */
-} xXF86BigfontQueryFontReply;
-#define sz_xXF86BigfontQueryFontReply	72
-
-/* Bit masks that can be set in the flags */
-#define XF86Bigfont_FLAGS_Shm 1
-
-#endif /* _XF86BIGFSTR_H_ */
+#warning "xf86bigfstr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/xf86bigfproto.h> for the protocol defines."
+#include <X11/extensions/xf86bigfproto.h>