xserver randrproto mesa xkeyboard-config git update 25 Feb 2011

4 files changed, 285 insertions, 284 deletions

diff --git a/xorg-server/include/colormapst.h b/xorg-server/include/colormapst.h
index 385c7969c..b597e2c60 100644
--- a/xorg-server/include/colormapst.h
+++ b/xorg-server/include/colormapst.h
@@ -1,132 +1,132 @@
-/*

-

-Copyright 1987, 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.

-

-

-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-*/

-

-#ifndef CMAPSTRUCT_H

-#define CMAPSTRUCT_H 1

-

-#include <X11/Xarch.h>

-

-#include "colormap.h"

-#include "screenint.h"

-#include "privates.h"

-

-/* Shared color -- the color is used by AllocColorPlanes */

-typedef struct

-{

-    unsigned short color;

-    short  refcnt;

-} SHAREDCOLOR;

-

-/* LOCO -- a local color for a PseudoColor cell. DirectColor maps always

- * use the first value (called red) in the structure.  What channel they

- * are really talking about depends on which map they are in. */

-typedef struct

-{

-    unsigned short	red, green, blue;

-} LOCO;

-

-/* SHCO -- a shared color for a PseudoColor cell. Used with AllocColorPlanes.

- * DirectColor maps always use the first value (called red) in the structure.

- * What channel they are really talking about depends on which map they

- * are in. */

-typedef struct 

-{

-    SHAREDCOLOR *red, *green, *blue;

-} SHCO;

-

-

-/* color map entry */

-typedef struct _CMEntry

-{

-    union

-    {

-	LOCO	local;

-	SHCO	shco;

-    } co;

-    short	refcnt;

-    Bool	fShared;

-} Entry;

-

-/*

- * COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor

- * only needs one cell table, we arbitrarily pick red.  We keep track

- * of that table with freeRed, numPixelsRed, and clientPixelsRed

- *

- * The padN variables are unfortunate ABI BC. See fdo bug #6924.

- */

-

-typedef struct _ColormapRec

-{

-    VisualPtr	pVisual;

-    short	class;		/* PseudoColor or DirectColor */

-#if defined(_XSERVER64)

-    short	pad0;

-    XID		pad1;

-#endif

-    XID		mid;		/* client's name for colormap */

-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)

-    XID		pad2;

-#endif

-    ScreenPtr	pScreen;	/* screen map is associated with */

-    short	flags;		/* 1 = IsDefault

-				 * 2 = AllAllocated */

-    int		freeRed;

-    int		freeGreen;

-    int		freeBlue;

-    int		*numPixelsRed;	

-    int		*numPixelsGreen;	

-    int		*numPixelsBlue;	

-    Pixel	**clientPixelsRed;

-    Pixel	**clientPixelsGreen;

-    Pixel	**clientPixelsBlue;

-    Entry	*red;

-    Entry 	*green;

-    Entry	*blue;

-    PrivateRec	*devPrivates;

-} ColormapRec;

-	      

-#endif /* COLORMAP_H */

+/*
+
+Copyright 1987, 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.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+*/
+
+#ifndef CMAPSTRUCT_H
+#define CMAPSTRUCT_H 1
+
+#include <X11/Xarch.h>
+
+#include "colormap.h"
+#include "screenint.h"
+#include "privates.h"
+
+/* Shared color -- the color is used by AllocColorPlanes */
+typedef struct
+{
+    unsigned short color;
+    short  refcnt;
+} SHAREDCOLOR;
+
+/* LOCO -- a local color for a PseudoColor cell. DirectColor maps always
+ * use the first value (called red) in the structure.  What channel they
+ * are really talking about depends on which map they are in. */
+typedef struct
+{
+    unsigned short	red, green, blue;
+} LOCO;
+
+/* SHCO -- a shared color for a PseudoColor cell. Used with AllocColorPlanes.
+ * DirectColor maps always use the first value (called red) in the structure.
+ * What channel they are really talking about depends on which map they
+ * are in. */
+typedef struct 
+{
+    SHAREDCOLOR *red, *green, *blue;
+} SHCO;
+
+
+/* color map entry */
+typedef struct _CMEntry
+{
+    union
+    {
+	LOCO	local;
+	SHCO	shco;
+    } co;
+    short	refcnt;
+    Bool	fShared;
+} Entry;
+
+/*
+ * COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor
+ * only needs one cell table, we arbitrarily pick red.  We keep track
+ * of that table with freeRed, numPixelsRed, and clientPixelsRed
+ *
+ * The padN variables are unfortunate ABI BC. See fdo bug #6924.
+ */
+
+typedef struct _ColormapRec
+{
+    VisualPtr	pVisual;
+    short	class;		/* PseudoColor or DirectColor */
+#if defined(_LP64)
+    short	pad0;
+    XID		pad1;
+#endif
+    XID		mid;		/* client's name for colormap */
+#if defined(_LP64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
+    XID		pad2;
+#endif
+    ScreenPtr	pScreen;	/* screen map is associated with */
+    short	flags;		/* 1 = IsDefault
+				 * 2 = AllAllocated */
+    int		freeRed;
+    int		freeGreen;
+    int		freeBlue;
+    int		*numPixelsRed;	
+    int		*numPixelsGreen;	
+    int		*numPixelsBlue;	
+    Pixel	**clientPixelsRed;
+    Pixel	**clientPixelsGreen;
+    Pixel	**clientPixelsBlue;
+    Entry	*red;
+    Entry 	*green;
+    Entry	*blue;
+    PrivateRec	*devPrivates;
+} ColormapRec;
+	      
+#endif /* COLORMAP_H */
diff --git a/xorg-server/include/protocol-versions.h b/xorg-server/include/protocol-versions.h
index 441d76788..1d33bddcf 100644
--- a/xorg-server/include/protocol-versions.h
+++ b/xorg-server/include/protocol-versions.h
@@ -1,148 +1,148 @@
-/*

- * Copyright © 2009 Red Hat, Inc.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice (including the next

- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.

- *

- */

-

-/**

- * This file specifies the server-supported protocol versions.

- */

-#ifndef _PROTOCOL_VERSIONS_

-#define _PROTOCOL_VERSIONS_

-

-/* Apple DRI */

-#define SERVER_APPLEDRI_MAJOR_VERSION		1

-#define SERVER_APPLEDRI_MINOR_VERSION		0

-#define SERVER_APPLEDRI_PATCH_VERSION		0

-

-/* AppleWM */

-#define SERVER_APPLEWM_MAJOR_VERSION		1

-#define SERVER_APPLEWM_MINOR_VERSION		3

-#define SERVER_APPLEWM_PATCH_VERSION		0

-

-/* Composite */

-#define SERVER_COMPOSITE_MAJOR_VERSION		0

-#define SERVER_COMPOSITE_MINOR_VERSION		4

-

-/* Damage */

-#define SERVER_DAMAGE_MAJOR_VERSION		1

-#define SERVER_DAMAGE_MINOR_VERSION		1

-

-/* DMX */

-#define SERVER_DMX_MAJOR_VERSION		2

-#define SERVER_DMX_MINOR_VERSION		2

-#define SERVER_DMX_PATCH_VERSION		20040604

-

-/* Generic event extension */

-#define SERVER_GE_MAJOR_VERSION                 1

-#define SERVER_GE_MINOR_VERSION                 0

-

-/* GLX */

-#define SERVER_GLX_MAJOR_VERSION		1

-#define SERVER_GLX_MINOR_VERSION		4

-

-/* Xinerama */

-#define SERVER_PANORAMIX_MAJOR_VERSION          1

-#define SERVER_PANORAMIX_MINOR_VERSION		1

-

-/* RandR */

-#define SERVER_RANDR_MAJOR_VERSION		1

-#define SERVER_RANDR_MINOR_VERSION		4

-

-/* Record */

-#define SERVER_RECORD_MAJOR_VERSION		1

-#define SERVER_RECORD_MINOR_VERSION		13

-

-/* Render */

-#define SERVER_RENDER_MAJOR_VERSION		0

-#define SERVER_RENDER_MINOR_VERSION		11

-

-/* RandR Xinerama */

-#define SERVER_RRXINERAMA_MAJOR_VERSION		1

-#define SERVER_RRXINERAMA_MINOR_VERSION		1

-

-/* Screensaver */

-#define SERVER_SAVER_MAJOR_VERSION		1

-#define SERVER_SAVER_MINOR_VERSION		1

-

-/* Security */

-#define SERVER_SECURITY_MAJOR_VERSION		1

-#define SERVER_SECURITY_MINOR_VERSION		0

-

-/* Shape */

-#define SERVER_SHAPE_MAJOR_VERSION		1

-#define SERVER_SHAPE_MINOR_VERSION		1

-

-/* SHM */

-#define SERVER_SHM_MAJOR_VERSION		1

-#define SERVER_SHM_MINOR_VERSION		1

-

-/* Sync */

-#define SERVER_SYNC_MAJOR_VERSION		3

-#define SERVER_SYNC_MINOR_VERSION		1

-

-/* Windows WM */

-#define SERVER_WINDOWSWM_MAJOR_VERSION		1

-#define SERVER_WINDOWSWM_MINOR_VERSION		0

-#define SERVER_WINDOWSWM_PATCH_VERSION		0

-

-/* Xcalibrate */

-#define SERVER_XCALIBRATE_MAJOR_VERSION		0

-#define SERVER_XCALIBRATE_MINOR_VERSION		1

-

-/* DGA */

-#define SERVER_XDGA_MAJOR_VERSION		2

-#define SERVER_XDGA_MINOR_VERSION		0

-

-/* Big Font */

-#define SERVER_XF86BIGFONT_MAJOR_VERSION	1

-#define SERVER_XF86BIGFONT_MINOR_VERSION	1

-

-/* DRI */

-#define SERVER_XF86DRI_MAJOR_VERSION		4

-#define SERVER_XF86DRI_MINOR_VERSION		1

-#define SERVER_XF86DRI_PATCH_VERSION		20040604

-

-/* Vidmode */

-#define SERVER_XF86VIDMODE_MAJOR_VERSION	2

-#define SERVER_XF86VIDMODE_MINOR_VERSION	2

-

-/* Fixes */

-#define SERVER_XFIXES_MAJOR_VERSION		4

-#define SERVER_XFIXES_MINOR_VERSION		0

-

-/* X Input */

-#define SERVER_XI_MAJOR_VERSION			2

-#define SERVER_XI_MINOR_VERSION			0

-

-/* XKB */

-#define SERVER_XKB_MAJOR_VERSION		1

-#define SERVER_XKB_MINOR_VERSION		0

-

-/* Resource */

-#define SERVER_XRES_MAJOR_VERSION		1

-#define SERVER_XRES_MINOR_VERSION		0

-

-/* XvMC */

-#define SERVER_XVMC_MAJOR_VERSION		1

-#define SERVER_XVMC_MINOR_VERSION		1

-

-#endif

+/*
+ * Copyright © 2009 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ */
+
+/**
+ * This file specifies the server-supported protocol versions.
+ */
+#ifndef _PROTOCOL_VERSIONS_
+#define _PROTOCOL_VERSIONS_
+
+/* Apple DRI */
+#define SERVER_APPLEDRI_MAJOR_VERSION		1
+#define SERVER_APPLEDRI_MINOR_VERSION		0
+#define SERVER_APPLEDRI_PATCH_VERSION		0
+
+/* AppleWM */
+#define SERVER_APPLEWM_MAJOR_VERSION		1
+#define SERVER_APPLEWM_MINOR_VERSION		3
+#define SERVER_APPLEWM_PATCH_VERSION		0
+
+/* Composite */
+#define SERVER_COMPOSITE_MAJOR_VERSION		0
+#define SERVER_COMPOSITE_MINOR_VERSION		4
+
+/* Damage */
+#define SERVER_DAMAGE_MAJOR_VERSION		1
+#define SERVER_DAMAGE_MINOR_VERSION		1
+
+/* DMX */
+#define SERVER_DMX_MAJOR_VERSION		2
+#define SERVER_DMX_MINOR_VERSION		2
+#define SERVER_DMX_PATCH_VERSION		20040604
+
+/* Generic event extension */
+#define SERVER_GE_MAJOR_VERSION                 1
+#define SERVER_GE_MINOR_VERSION                 0
+
+/* GLX */
+#define SERVER_GLX_MAJOR_VERSION		1
+#define SERVER_GLX_MINOR_VERSION		4
+
+/* Xinerama */
+#define SERVER_PANORAMIX_MAJOR_VERSION          1
+#define SERVER_PANORAMIX_MINOR_VERSION		1
+
+/* RandR */
+#define SERVER_RANDR_MAJOR_VERSION		1
+#define SERVER_RANDR_MINOR_VERSION		3
+
+/* Record */
+#define SERVER_RECORD_MAJOR_VERSION		1
+#define SERVER_RECORD_MINOR_VERSION		13
+
+/* Render */
+#define SERVER_RENDER_MAJOR_VERSION		0
+#define SERVER_RENDER_MINOR_VERSION		11
+
+/* RandR Xinerama */
+#define SERVER_RRXINERAMA_MAJOR_VERSION		1
+#define SERVER_RRXINERAMA_MINOR_VERSION		1
+
+/* Screensaver */
+#define SERVER_SAVER_MAJOR_VERSION		1
+#define SERVER_SAVER_MINOR_VERSION		1
+
+/* Security */
+#define SERVER_SECURITY_MAJOR_VERSION		1
+#define SERVER_SECURITY_MINOR_VERSION		0
+
+/* Shape */
+#define SERVER_SHAPE_MAJOR_VERSION		1
+#define SERVER_SHAPE_MINOR_VERSION		1
+
+/* SHM */
+#define SERVER_SHM_MAJOR_VERSION		1
+#define SERVER_SHM_MINOR_VERSION		1
+
+/* Sync */
+#define SERVER_SYNC_MAJOR_VERSION		3
+#define SERVER_SYNC_MINOR_VERSION		1
+
+/* Windows WM */
+#define SERVER_WINDOWSWM_MAJOR_VERSION		1
+#define SERVER_WINDOWSWM_MINOR_VERSION		0
+#define SERVER_WINDOWSWM_PATCH_VERSION		0
+
+/* Xcalibrate */
+#define SERVER_XCALIBRATE_MAJOR_VERSION		0
+#define SERVER_XCALIBRATE_MINOR_VERSION		1
+
+/* DGA */
+#define SERVER_XDGA_MAJOR_VERSION		2
+#define SERVER_XDGA_MINOR_VERSION		0
+
+/* Big Font */
+#define SERVER_XF86BIGFONT_MAJOR_VERSION	1
+#define SERVER_XF86BIGFONT_MINOR_VERSION	1
+
+/* DRI */
+#define SERVER_XF86DRI_MAJOR_VERSION		4
+#define SERVER_XF86DRI_MINOR_VERSION		1
+#define SERVER_XF86DRI_PATCH_VERSION		20040604
+
+/* Vidmode */
+#define SERVER_XF86VIDMODE_MAJOR_VERSION	2
+#define SERVER_XF86VIDMODE_MINOR_VERSION	2
+
+/* Fixes */
+#define SERVER_XFIXES_MAJOR_VERSION		4
+#define SERVER_XFIXES_MINOR_VERSION		0
+
+/* X Input */
+#define SERVER_XI_MAJOR_VERSION			2
+#define SERVER_XI_MINOR_VERSION			0
+
+/* XKB */
+#define SERVER_XKB_MAJOR_VERSION		1
+#define SERVER_XKB_MINOR_VERSION		0
+
+/* Resource */
+#define SERVER_XRES_MAJOR_VERSION		1
+#define SERVER_XRES_MINOR_VERSION		0
+
+/* XvMC */
+#define SERVER_XVMC_MAJOR_VERSION		1
+#define SERVER_XVMC_MINOR_VERSION		1
+
+#endif
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 9f4fbf3df..a9357e8a5 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -404,7 +404,7 @@ typedef    void (* DeviceCursorCleanupProcPtr)(
         ScreenPtr    /* pScreen */);
 
 typedef void (*ConstrainCursorHarderProcPtr)(
-       DeviceIntPtr, ScreenPtr, int *, int *);
+       DeviceIntPtr, ScreenPtr, int, int *, int *);
 
 typedef struct _Screen {
     int			myNum;	/* index of this instance in Screens[] */
diff --git a/xorg-server/include/xorg-server.h.in b/xorg-server/include/xorg-server.h.in
index 76cab16b6..b10b9949e 100644
--- a/xorg-server/include/xorg-server.h.in
+++ b/xorg-server/include/xorg-server.h.in
@@ -157,9 +157,6 @@
 /* Name of X server */
 #undef __XSERVERNAME__
 
-/* Define to 1 if unsigned long is 64 bits. */
-#undef _XSERVER64
-
 /* Building vgahw module */
 #undef WITH_VGAHW
 
@@ -187,4 +184,8 @@
 /* X Access Control Extension */
 #undef XACE
 
+#ifdef _LP64
+#define _XSERVER64 1
+#endif
+
 #endif /* _XORG_SERVER_H_ */