From 1078f97706b77ab93fb30204acf270cfb652c900 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 7 Oct 2016 21:00:20 +0200 Subject: rename xf86bigfstr.h to xf86bigfproto.h --- debian/copyright.in | 2 +- debian/rules | 2 +- nx-X11/include/extensions/Imakefile | 2 +- nx-X11/include/extensions/xf86bigfproto.h | 88 ++++++++++++++++++++++++++++++ nx-X11/include/extensions/xf86bigfstr.h | 88 ------------------------------ nx-X11/lib/X11/Font.c | 2 +- nx-X11/programs/Xserver/Xext/xf86bigfont.c | 2 +- nx-X11/programs/Xserver/mi/miinitext.c | 2 +- nx-libs.spec | 2 +- 9 files changed, 95 insertions(+), 95 deletions(-) create mode 100644 nx-X11/include/extensions/xf86bigfproto.h delete mode 100644 nx-X11/include/extensions/xf86bigfstr.h diff --git a/debian/copyright.in b/debian/copyright.in index 8d6f30208..7e11780ea 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -3446,7 +3446,7 @@ License: Expat FIXME Files: nx-X11/include/extensions/xf86bigfont.h - nx-X11/include/extensions/xf86bigfstr.h + nx-X11/include/extensions/xf86bigfproto.h nx-X11/programs/Xserver/Xext/xf86bigfont.c Copyright: 1999-2000, Bruno Haible 1999-2000, The XFree86 Project, Inc diff --git a/debian/rules b/debian/rules index 047839c2f..5f8ba75ac 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,7 @@ override_dh_install: rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h - rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfstr.h + rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfproto.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfont.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/dpms.h diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index d2be4b324..2d8f63494 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -13,7 +13,7 @@ SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h #endif #if BuildXF86BigfontExt -XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfstr.h +XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfproto.h #endif #if BuildXvExt XVHEADERS = Xv.h Xvlib.h Xvproto.h diff --git a/nx-X11/include/extensions/xf86bigfproto.h b/nx-X11/include/extensions/xf86bigfproto.h new file mode 100644 index 000000000..b4b791fb9 --- /dev/null +++ b/nx-X11/include/extensions/xf86bigfproto.h @@ -0,0 +1,88 @@ +/* + * 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 + +#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; + CARD32 walign1 B32; + xCharInfo maxBounds; + CARD32 walign2 B32; + 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/nx-X11/include/extensions/xf86bigfstr.h b/nx-X11/include/extensions/xf86bigfstr.h deleted file mode 100644 index 4a8eda47a..000000000 --- a/nx-X11/include/extensions/xf86bigfstr.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * 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 - -#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; - CARD32 walign1 B32; - xCharInfo maxBounds; - CARD32 walign2 B32; - 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_ */ diff --git a/nx-X11/lib/X11/Font.c b/nx-X11/lib/X11/Font.c index 7943ba7a1..298d96c63 100644 --- a/nx-X11/lib/X11/Font.c +++ b/nx-X11/lib/X11/Font.c @@ -45,7 +45,7 @@ authorization from the X Consortium and the XFree86 Project. #include #include -#include +#include #endif #include "Xlcint.h" diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index 253706ad2..67a09f77b 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -74,7 +74,7 @@ #include "protocol-versions.h" #define _XF86BIGFONT_SERVER_ -#include +#include static void XF86BigfontResetProc( ExtensionEntry * /* extEntry */ diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index 22f48ffd8..b48ed8a1c 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -172,7 +172,7 @@ typedef void (*InitExtension)(void); #include #endif #ifdef XF86BIGFONT -#include +#include #endif #ifdef RES #include diff --git a/nx-libs.spec b/nx-libs.spec index 47ac2aa52..6ba05c5ee 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -562,7 +562,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_includedir}/nx-X11/extensions/syncstr.h %{_includedir}/nx-X11/extensions/xcmiscstr.h %{_includedir}/nx-X11/extensions/xf86bigfont.h -%{_includedir}/nx-X11/extensions/xf86bigfstr.h +%{_includedir}/nx-X11/extensions/xf86bigfproto.h %{_includedir}/nx-X11/extensions/xfixesproto.h %{_includedir}/nx-X11/extensions/xfixeswire.h %{_includedir}/nx-X11/extensions/xtestconst.h -- cgit v1.2.3