summaryrefslogtreecommitdiff
path: root/Xext/bigreq.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:07 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:07 +0000
commit0097b6fe2d1739e46e4e7726aaa481b6dc84870c (patch)
tree5e279fda13b69a02c684338ee803defbda33ab08 /Xext/bigreq.c
parentc57959ad6a4c0f5329762f401fd7871ffb2ee90c (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'Xext/bigreq.c')
-rw-r--r--Xext/bigreq.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 0d2dc5178..ae73783d9 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.5 2001/12/14 19:58:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.9 2003/11/17 22:20:26 dawes Exp $ */
#define NEED_EVENTS
#include "X.h"
@@ -36,26 +36,35 @@ from The Open Group.
#include "dixstruct.h"
#include "extnsionst.h"
#include "bigreqstr.h"
+#include "opaque.h"
+#include "modinit.h"
+#if 0
static unsigned char XBigReqCode;
+#endif
static void BigReqResetProc(
-#if NeedFunctionPrototypes
ExtensionEntry * /* extEntry */
-#endif
);
static DISPATCH_PROC(ProcBigReqDispatch);
void
-BigReqExtensionInit()
+BigReqExtensionInit(INITARGS)
{
+#if 0
ExtensionEntry *extEntry;
if ((extEntry = AddExtension(XBigReqExtensionName, 0, 0,
ProcBigReqDispatch, ProcBigReqDispatch,
BigReqResetProc, StandardMinorOpcode)) != 0)
XBigReqCode = (unsigned char)extEntry->base;
+#else
+ (void) AddExtension(XBigReqExtensionName, 0, 0,
+ ProcBigReqDispatch, ProcBigReqDispatch,
+ BigReqResetProc, StandardMinorOpcode);
+#endif
+
DeclareExtensionSecurity(XBigReqExtensionName, TRUE);
}
@@ -84,7 +93,7 @@ ProcBigReqDispatch (client)
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.max_request_size = MAX_BIG_REQUEST_SIZE;
+ rep.max_request_size = maxBigRequestSize;
if (client->swapped) {
swaps(&rep.sequenceNumber, n);
swapl(&rep.max_request_size, n);