Update to xf86bigfontproto 1.2.0

8 files changed, 285 insertions, 275 deletions

diff --git a/proto/xf86bigfontproto/ChangeLog b/proto/xf86bigfontproto/ChangeLog
index c722b519a..feade570e 100644
--- a/proto/xf86bigfontproto/ChangeLog
+++ b/proto/xf86bigfontproto/ChangeLog
@@ -1,4 +1,172 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 059880bf0f9292b90a139d1eebe3bf18390d0a83
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 26 15:25:15 2009 +1000
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    xf86bigfontproto 1.2.0
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ba8d972415ab6b45aa1ba31eae8706f92d60c2af
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 26 15:23:12 2009 +1000
+
+    Remove server-specific declarations.
+
+commit 606268163c99ca8996399a9f99d240ac8253c7f3
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 26 14:59:47 2009 +1000
+
+    Remove RCS tags
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d405a7201f4de2121530b67f7628f95d2e0467b1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Aug 26 14:58:08 2009 +1000
+
+    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>
+
+commit b9f44fb9fdfdc623311774afdd0b7a819ba9ffec
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Tue Jan 27 20:06:28 2009 -0200
+
+    Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 0c40374c853c83ecc0a74b4fc34cdc3140b1c3ca
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:39:11 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit 505cd9e0c6d8e7d4ea916d3f1453bbeb7925c3a1
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:54:26 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit d1b1b7356e077dd238ecccb99cde406605284c2d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jul 14 18:56:43 2006 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit dc91454a65edc305e6181368cfb06775f9622158
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:39 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit bc637a1d3a5e4b0cc4094987ffc0afd719193979
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:16 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 238ef28dfd19be8f2937e5ed80c66a0844ec07a4
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Aug 2 19:19:40 2005 +0000
+
+    Add basic .cvsignore files for proto modules.
+
+commit 39818ff31644cbd2029365f7ef5ea9555b8cb147
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:57 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit 9626de7ff9aef3ab7652e5a7a5f967b7a1dd5307
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sun Jul 3 07:13:11 2005 +0000
+
+    Change include path to <X11/fonts/font.h>.
+
+commit b7d38e63461b3063362d0c5c9716c40e8b643e43
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat May 21 04:54:25 2005 +0000
+
+    Set version to 1.1.
+
+commit 2547b35e1f21a90ade799f0545b4fb50f9753337
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:22:40 2005 +0000
+
+    revert last change, didn't do right thing at all, sorry for the noise
+
+commit 74f2a736c54d85c4c6d98134a74859e748ee5046
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:10:20 2005 +0000
+
+    Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 760d1a6e003e73b17539ee0dffc260d9cd282fcb
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Wed May 18 07:38:46 2005 +0000
+
+    Add COPYING file for XF86BigFont; assumed to be under the XFree86 catch-all
+        license.
+
+commit 9f9835c828a2d8d51c099a829f7819a83f8a6f85
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Mon May 9 18:20:07 2005 +0000
+
+    Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 38587b109077cbe56b74f4324a6f9338b1a66df9
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri May 6 01:46:32 2005 +0000
+
+    Initial build system files for proto module.
+
+commit 3a1efe7f2752739fdc4a4eb3f947b95cdda32f5e
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 18:43:06 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 5c59f9c5f6733894c39fc928892d0c81bc32ad6d
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:31:36 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 304c9c7f8dc88530f7ebbb1a37517dad45f6c778
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:10:54 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 76d42aac39d68c5ad128e3d22bfcab8b777890f8
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:14 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit b12d799f50028d9fb7e0e279230178ab2486d311
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:22:28 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 4cdaa2c0767d446c867da34d9acd7c5f2d1fae55
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 408ada0589b76e0041f4c23ef92955b60ef215ef
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    Initial revision
diff --git a/proto/xf86bigfontproto/Makefile b/proto/xf86bigfontproto/Makefile
index 3005e1782..042a69a07 100644
--- a/proto/xf86bigfontproto/Makefile
+++ b/proto/xf86bigfontproto/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2010/04/24 20:00:40 matthieu Exp $
 
 HEADERS_SUBDIR=	X11/extensions/
-HEADERS=	xf86bigfont.h xf86bigfstr.h
+HEADERS=	xf86bigfont.h xf86bigfproto.h xf86bigfstr.h
 PKGCONFIG=	xf86bigfontproto.pc
 
 .include <bsd.xorg.mk>
diff --git a/proto/xf86bigfontproto/Makefile.am b/proto/xf86bigfontproto/Makefile.am
index 1d07e50e7..bc0af8060 100644
--- a/proto/xf86bigfontproto/Makefile.am
+++ b/proto/xf86bigfontproto/Makefile.am
@@ -1,9 +1,20 @@
 xf86bigfontdir = $(includedir)/X11/extensions
 xf86bigfont_HEADERS = \
 	xf86bigfont.h \
+	xf86bigfproto.h \
 	xf86bigfstr.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xf86bigfontproto.pc
 
-EXTRA_DIST = autogen.sh xf86bigfontproto.pc.in
+EXTRA_DIST = xf86bigfontproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/proto/xf86bigfontproto/configure.ac b/proto/xf86bigfontproto/configure.ac
index 765b76128..2ad343592 100644
--- a/proto/xf86bigfontproto/configure.ac
+++ b/proto/xf86bigfontproto/configure.ac
@@ -1,8 +1,12 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86BigFontProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XF86BigFontProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            xf86bigfontproto.pc])
diff --git a/proto/xf86bigfontproto/mkinstalldirs b/proto/xf86bigfontproto/mkinstalldirs
deleted file mode 100644
index 259dbfcd3..000000000
--- a/proto/xf86bigfontproto/mkinstalldirs
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-06-29.22
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/proto/xf86bigfontproto/xf86bigfont.h b/proto/xf86bigfontproto/xf86bigfont.h
index 654cc401b..1bf47e92d 100644
--- a/proto/xf86bigfontproto/xf86bigfont.h
+++ b/proto/xf86bigfontproto/xf86bigfont.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.1 2000/02/08 17:18:25 dawes Exp $ */
 /*
  * Declarations for the BIGFONT extension.
  *
@@ -11,8 +10,6 @@
 #ifndef _XF86BIGFONT_H_
 #define _XF86BIGFONT_H_
 
-#include <X11/Xfuncproto.h>
-
 #define X_XF86BigfontQueryVersion	0
 #define X_XF86BigfontQueryFont		1
 
@@ -20,18 +17,4 @@
 
 #define XF86BigfontNumberErrors		0
 
-#ifdef _XF86BIGFONT_SERVER_
-
-_XFUNCPROTOBEGIN
-
-#include <X11/fonts/font.h>
-
-extern void XFree86BigfontExtensionInit(void);
-extern void XF86BigfontFreeFontShm(FontPtr);
-extern void XF86BigfontCleanup(void);
-
-_XFUNCPROTOEND
-
-#endif /* _XF86BIGFONT_SERVER_ */
-
 #endif /* _XF86BIGFONT_H_ */
diff --git a/proto/xf86bigfontproto/xf86bigfproto.h b/proto/xf86bigfontproto/xf86bigfproto.h
new file mode 100644
index 000000000..c041c9aaf
--- /dev/null
+++ b/proto/xf86bigfontproto/xf86bigfproto.h
@@ -0,0 +1,92 @@
+/*
+ * 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/proto/xf86bigfontproto/xf86bigfstr.h b/proto/xf86bigfontproto/xf86bigfstr.h
index 7ba199b58..cf6735d49 100644
--- a/proto/xf86bigfontproto/xf86bigfstr.h
+++ b/proto/xf86bigfontproto/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>