From 04e6f43c2645419569325919b7c6e69e8d5244dd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 25 Aug 2009 15:23:39 +1000 Subject: Move bigreqstr.h to bigreqsproto.h. Leave a stub for bigreqstr.h to warn potential users. Signed-off-by: Peter Hutterer --- Makefile.am | 1 + bigreqsproto.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ bigreqstr.h | 70 +++------------------------------------------------------- 3 files changed, 71 insertions(+), 67 deletions(-) create mode 100644 bigreqsproto.h diff --git a/Makefile.am b/Makefile.am index ea2ce67..d748fcb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ bigreqsdir = $(includedir)/X11/extensions bigreqs_HEADERS = \ + bigreqsproto.h \ bigreqstr.h pkgconfigdir = $(libdir)/pkgconfig diff --git a/bigreqsproto.h b/bigreqsproto.h new file mode 100644 index 0000000..bd0f8e5 --- /dev/null +++ b/bigreqsproto.h @@ -0,0 +1,67 @@ +/* + +Copyright 1992, 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 _BIGREQSPROTO_H_ +#define _BIGREQSPROTO_H_ + +#define X_BigReqEnable 0 + +#define XBigReqNumberEvents 0 + +#define XBigReqNumberErrors 0 + +#define XBigReqExtensionName "BIG-REQUESTS" + +typedef struct { + CARD8 reqType; /* always XBigReqCode */ + CARD8 brReqType; /* always X_BigReqEnable */ + CARD16 length B16; +} xBigReqEnableReq; +#define sz_xBigReqEnableReq 4 + +typedef struct { + BYTE type; /* X_Reply */ + CARD8 pad0; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 max_request_size B32; + CARD32 pad1 B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xBigReqEnableReply; +#define sz_xBigReqEnableReply 32 + + +typedef struct { + CARD8 reqType; + CARD8 data; + CARD16 zero B16; + CARD32 length B32; +} xBigReq; + +#endif /* _BIGREQSPROTO_H_ */ diff --git a/bigreqstr.h b/bigreqstr.h index bbbc10d..0a023db 100644 --- a/bigreqstr.h +++ b/bigreqstr.h @@ -1,67 +1,3 @@ -/* - -Copyright 1992, 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 _BIGREQSTR_H_ -#define _BIGREQSTR_H_ - -#define X_BigReqEnable 0 - -#define XBigReqNumberEvents 0 - -#define XBigReqNumberErrors 0 - -#define XBigReqExtensionName "BIG-REQUESTS" - -typedef struct { - CARD8 reqType; /* always XBigReqCode */ - CARD8 brReqType; /* always X_BigReqEnable */ - CARD16 length B16; -} xBigReqEnableReq; -#define sz_xBigReqEnableReq 4 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 pad0; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 max_request_size B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xBigReqEnableReply; -#define sz_xBigReqEnableReply 32 - - -typedef struct { - CARD8 reqType; - CARD8 data; - CARD16 zero B16; - CARD32 length B32; -} xBigReq; - -#endif /* _BIGREQSTR_H_ */ +#warning "bigreqstr.h is obsolete and may be removed in the future." +#warning "include for the protocol defines." +#include -- cgit v1.2.1