Git update 24/2/2010"

4 files changed, 457 insertions, 457 deletions

diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in
index 7907b0a25..058c8fd14 100644
--- a/xorg-server/include/dix-config.h.in
+++ b/xorg-server/include/dix-config.h.in
@@ -1,451 +1,449 @@
-/* dix-config.h.in: not at all generated.                      -*- c -*- */

-

-#ifndef _DIX_CONFIG_H_

-#define _DIX_CONFIG_H_

-

-/* Support BigRequests extension */

-#undef BIGREQS

-

-/* Builder address */

-#undef BUILDERADDR

-

-/* Operating System Name */

-#undef OSNAME

-

-/* Operating System Vendor */

-#undef OSVENDOR

-

-/* Builder string */

-#undef BUILDERSTRING

-

-/* Default font path */

-#undef COMPILEDDEFAULTFONTPATH

-

-/* Miscellaneous server configuration files path */

-#undef SERVER_MISC_CONFIG_PATH

-

-/* Support Composite Extension */

-#undef COMPOSITE

-

-/* Support Damage extension */

-#undef DAMAGE

-

-/* Build for darwin with Quartz support */

-#undef DARWIN_WITH_QUARTZ

-

-/* Use OsVendorVErrorF */

-#undef DDXOSVERRORF

-

-/* Use ddxBeforeReset */

-#undef DDXBEFORERESET

-

-/* Build DPMS extension */

-#undef DPMSExtension

-

-/* Build GLX extension */

-#undef GLXEXT

-

-/* Build GLX DRI loader */

-#undef GLX_DRI

-

-/* Path to DRI drivers */

-#undef DRI_DRIVER_PATH

-

-/* Support XDM-AUTH*-1 */

-#undef HASXDMAUTH

-

-/* Define to 1 if you have the `getdtablesize' function. */

-#undef HAS_GETDTABLESIZE

-

-/* Define to 1 if you have the `getifaddrs' function. */

-#undef HAS_GETIFADDRS

-

-/* Define to 1 if you have the `getpeereid' function. */

-#undef HAS_GETPEEREID

-

-/* Define to 1 if you have the `getpeerucred' function. */

-#undef HAS_GETPEERUCRED

-

-/* Define to 1 if you have the `mmap' function. */

-#undef HAS_MMAP

-

-/* Support SHM */

-#undef HAS_SHM

-

-/* Have the 'strlcpy' function */

-#undef HAS_STRLCPY

-

-/* Define to 1 if you have the <asm/mtrr.h> header file. */

-#undef HAVE_ASM_MTRR_H

-

-/* Has backtrace support */

-#undef HAVE_BACKTRACE

-

-/* Define to 1 if you have the <byteswap.h> header file. */

-#undef HAVE_BYTESWAP_H

-

-/* Define to 1 if you have cbrt */

-#undef HAVE_CBRT

-

-/* Define to 1 if you have the <dbm.h> header file. */

-#undef HAVE_DBM_H

-

-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.

-   */

-#undef HAVE_DIRENT_H

-

-/* Define to 1 if you have the <dlfcn.h> header file. */

-#undef HAVE_DLFCN_H

-

-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */

-#undef HAVE_DOPRNT

-

-/* Have execinfo.h */

-#undef HAVE_EXECINFO_H

-

-/* Define to 1 if you have the <fcntl.h> header file. */

-#undef HAVE_FCNTL_H

-

-/* Define to 1 if you have the `geteuid' function. */

-#undef HAVE_GETEUID

-

-/* Define to 1 if you have the `getisax' function. */

-#undef HAVE_GETISAX

-

-/* Define to 1 if you have the `getuid' function. */

-#undef HAVE_GETUID

-

-/* Define to 1 if you have the `getzoneid' function. */

-#undef HAVE_GETZONEID

-

-/* Define to 1 if you have the <inttypes.h> header file. */

-#undef HAVE_INTTYPES_H

-

-/* Have Quartz */

-#undef XQUARTZ

-

-/* Support application updating through sparkle. */

-#undef XQUARTZ_SPARKLE

-

-/* Prefix to use for launchd identifiers */

-#undef LAUNCHD_ID_PREFIX

-

-/* Build a standalone xpbproxy */

-#undef STANDALONE_XPBPROXY

-

-/* Define to 1 if you have the `m' library (-lm). */

-#undef HAVE_LIBM

-

-/* Define to 1 if you have the `link' function. */

-#undef HAVE_LINK

-

-/* Define to 1 if you have the <linux/agpgart.h> header file. */

-#undef HAVE_LINUX_AGPGART_H

-

-/* Define to 1 if you have the <linux/apm_bios.h> header file. */

-#undef HAVE_LINUX_APM_BIOS_H

-

-/* Define to 1 if you have the <linux/fb.h> header file. */

-#undef HAVE_LINUX_FB_H

-

-/* Define to 1 if you have the `mkstemp' function. */

-#undef HAVE_MKSTEMP

-

-/* Define to 1 if you have the <ndbm.h> header file. */

-#undef HAVE_NDBM_H

-

-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */

-#undef HAVE_NDIR_H

-

-/* Define to 1 if you have the <rpcsvc/dbm.h> header file. */

-#undef HAVE_RPCSVC_DBM_H

-

-/* Define to use libc SHA1 functions */

-#undef HAVE_SHA1_IN_LIBC

-

-/* Define to use CommonCrypto SHA1 functions */

-#undef HAVE_SHA1_IN_COMMONCRYPTO

-

-/* Define to use libmd SHA1 functions */

-#undef HAVE_SHA1_IN_LIBMD

-

-/* Define to use libgcrypt SHA1 functions */

-#undef HAVE_SHA1_IN_LIBGCRYPT

-

-/* Define to use libsha1 for SHA1 */

-#undef HAVE_SHA1_IN_LIBSHA1

-

-/* Define to 1 if you have the `shmctl64' function. */

-#undef HAVE_SHMCTL64

-

-/* Define to 1 if you have the <stdint.h> header file. */

-#undef HAVE_STDINT_H

-

-/* Define to 1 if you have the <stdlib.h> header file. */

-#undef HAVE_STDLIB_H

-

-/* Define to 1 if you have the `strchr' function. */

-#undef HAVE_STRCHR

-

-/* Define to 1 if you have the <strings.h> header file. */

-#undef HAVE_STRINGS_H

-

-/* Define to 1 if you have the <string.h> header file. */

-#undef HAVE_STRING_H

-

-/* Define to 1 if you have the `strrchr' function. */

-#undef HAVE_STRRCHR

-

-/* Define to 1 if you have the `strtol' function. */

-#undef HAVE_STRTOL

-

-/* Define to 1 if SYSV IPC is available */

-#undef HAVE_SYSV_IPC

-

-/* Define to 1 if you have the <sys/agpio.h> header file. */

-#undef HAVE_SYS_AGPIO_H

-

-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.

-   */

-#undef HAVE_SYS_DIR_H

-

-/* Define to 1 if you have the <sys/io.h> header file. */

-#undef HAVE_SYS_IO_H

-

-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.

-   */

-#undef HAVE_SYS_NDIR_H

-

-/* Define to 1 if you have the <sys/stat.h> header file. */

-#undef HAVE_SYS_STAT_H

-

-/* Define to 1 if you have the <sys/types.h> header file. */

-#undef HAVE_SYS_TYPES_H

-

-/* Define to 1 if you have the <sys/vm86.h> header file. */

-#undef HAVE_SYS_VM86_H

-

-/* Define to 1 if you have the <tslib.h> header file. */

-#undef HAVE_TSLIB_H

-

-/* Define to 1 if you have the <unistd.h> header file. */

-#undef HAVE_UNISTD_H

-

-/* Define to 1 if you have the <fnmatch.h> header file. */

-#undef HAVE_FNMATCH_H

-

-/* Have /dev/urandom */

-#undef HAVE_URANDOM

-

-/* Define to 1 if you have the `vprintf' function. */

-#undef HAVE_VPRINTF

-

-/* Support IPv6 for TCP connections */

-#undef IPv6

-

-/* Support os-specific local connections */

-#undef LOCALCONN

-

-/* Support MIT-SHM Extension */

-#undef MITSHM

-

-/* Enable some debugging code */

-#undef DEBUG

-

-/* Name of package */

-#undef PACKAGE

-

-/* Internal define for Xinerama */

-#undef PANORAMIX

-

-/* Overall prefix */

-#undef PROJECTROOT

-

-/* Support RANDR extension */

-#undef RANDR

-

-/* Support Record extension */

-#undef XRECORD

-

-/* Support RENDER extension */

-#undef RENDER

-

-/* Support X resource extension */

-#undef RES

-

-/* Support MIT-SCREEN-SAVER extension */

-#undef SCREENSAVER

-

-/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */

-#undef SECURE_RPC

-

-/* Support SHAPE extension */

-#undef SHAPE

-

-/* Define to 1 on systems derived from System V Release 4 */

-#undef SVR4

-

-/* Support TCP socket connections */

-#undef TCPCONN

-

-/* Enable touchscreen support */

-#undef TOUCHSCREEN

-

-/* Support tslib touchscreen abstraction library */

-#undef TSLIB

-

-/* Support UNIX socket connections */

-#undef UNIXCONN

-

-/* Define to use byteswap macros from <sys/endian.h> */

-#undef USE_SYS_ENDIAN_H

-

-/* unaligned word accesses behave as expected */

-#undef WORKING_UNALIGNED_INT

-

-/* Build X string registry */

-#undef XREGISTRY

-

-/* Build X-ACE extension */

-#undef XACE

-

-/* Build SELinux extension */

-#undef XSELINUX

-

-/* Support XCMisc extension */

-#undef XCMISC

-

-/* Build Security extension */

-#undef XCSECURITY

-

-/* Support Xdmcp */

-#undef XDMCP

-

-/* Build XFree86 BigFont extension */

-#undef XF86BIGFONT

-

-/* Support XFree86 Video Mode extension */

-#undef XF86VIDMODE

-

-/* Support XFixes extension */

-#undef XFIXES

-

-/* Build XDGA support */

-#undef XFreeXDGA

-

-/* Support Xinerama extension */

-#undef XINERAMA

-

-/* Vendor release */

-#undef XORG_RELEASE

-

-/* Current Xorg version */

-#undef XORG_VERSION_CURRENT

-

-/* Xorg release date */

-#undef XORG_DATE

-

-/* Build Xv Extension */

-#undef XvExtension

-

-/* Build XvMC Extension */

-#undef XvMCExtension

-

-/* Support XSync extension */

-#undef XSYNC

-

-/* Support XTest extension */

-#undef XTEST

-

-/* Support Xv extension */

-#undef XV

-

-/* Build Multibuffer extension */

-#undef MULTIBUFFER

-

-/* Support DRI extension */

-#undef XF86DRI

-

-/* Build DRI2 extension */

-#undef DRI2

-

-/* Build DBE support */

-#undef DBE

-

-/* Vendor name */

-#undef XVENDORNAME

-

-/* Enable GNU and other extensions to the C environment for GLIBC */

-#undef _GNU_SOURCE

-

-/* Define to empty if `const' does not conform to ANSI C. */

-#undef const

-

-/* Define to `int' if <sys/types.h> does not define. */

-#undef pid_t

-

-/* Build Rootless code */

-#undef ROOTLESS

-

-/* Define to 1 if unsigned long is 64 bits. */

-#undef _XSERVER64

-

-/* System is BSD-like */

-#undef CSRG_BASED

-

-/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */

-#undef BSD44SOCKETS

-

-/* Support D-Bus */

-#undef HAVE_DBUS

-

-/* Use libudev for input hotplug */

-#undef CONFIG_UDEV

-

-/* Use D-Bus for input hotplug */

-#undef CONFIG_NEED_DBUS

-

-/* Support the D-Bus hotplug API */

-#undef CONFIG_DBUS_API

-

-/* Support HAL for hotplug */

-#undef CONFIG_HAL

-

-/* Use only built-in fonts */

-#undef BUILTIN_FONTS

-

-/* Have a monotonic clock from clock_gettime() */

-#undef MONOTONIC_CLOCK

-

-/* Define to 1 if the DTrace Xserver provider probes should be built in */

-#undef XSERVER_DTRACE

-

-/* Define to 16-bit byteswap macro */

-#undef bswap_16

-

-/* Define to 32-bit byteswap macro */

-#undef bswap_32

-

-/* Define to 64-bit byteswap macro */

-#undef bswap_64

-

-/* Need the strcasecmp function. */

-#undef NEED_STRCASECMP

-

-/* Need the strncasecmp function. */

-#undef NEED_STRNCASECMP

-

-/* Need the strcasestr function. */

-#undef NEED_STRCASESTR

-

-/* Define to 1 if you have the `ffs' function. */

-#undef HAVE_FFS

-

-/* Correctly set _XSERVER64 for OSX fat binaries */

-#ifdef __APPLE__

-#include "dix-config-apple-verbatim.h"

-#endif

-

-#undef HAVE_AVC_NETLINK_ACQUIRE_FD

-

-#endif /* _DIX_CONFIG_H_ */

+/* dix-config.h.in: not at all generated.                      -*- c -*- */
+
+#ifndef _DIX_CONFIG_H_
+#define _DIX_CONFIG_H_
+
+/* Support BigRequests extension */
+#undef BIGREQS
+
+/* Builder address */
+#undef BUILDERADDR
+
+/* Operating System Name */
+#undef OSNAME
+
+/* Operating System Vendor */
+#undef OSVENDOR
+
+/* Builder string */
+#undef BUILDERSTRING
+
+/* Default font path */
+#undef COMPILEDDEFAULTFONTPATH
+
+/* Miscellaneous server configuration files path */
+#undef SERVER_MISC_CONFIG_PATH
+
+/* Support Composite Extension */
+#undef COMPOSITE
+
+/* Support Damage extension */
+#undef DAMAGE
+
+/* Build for darwin with Quartz support */
+#undef DARWIN_WITH_QUARTZ
+
+/* Use OsVendorVErrorF */
+#undef DDXOSVERRORF
+
+/* Use ddxBeforeReset */
+#undef DDXBEFORERESET
+
+/* Build DPMS extension */
+#undef DPMSExtension
+
+/* Build GLX extension */
+#undef GLXEXT
+
+/* Build GLX DRI loader */
+#undef GLX_DRI
+
+/* Path to DRI drivers */
+#undef DRI_DRIVER_PATH
+
+/* Support XDM-AUTH*-1 */
+#undef HASXDMAUTH
+
+/* Define to 1 if you have the `getdtablesize' function. */
+#undef HAS_GETDTABLESIZE
+
+/* Define to 1 if you have the `getifaddrs' function. */
+#undef HAS_GETIFADDRS
+
+/* Define to 1 if you have the `getpeereid' function. */
+#undef HAS_GETPEEREID
+
+/* Define to 1 if you have the `getpeerucred' function. */
+#undef HAS_GETPEERUCRED
+
+/* Define to 1 if you have the `mmap' function. */
+#undef HAS_MMAP
+
+/* Support SHM */
+#undef HAS_SHM
+
+/* Have the 'strlcpy' function */
+#undef HAS_STRLCPY
+
+/* Define to 1 if you have the <asm/mtrr.h> header file. */
+#undef HAVE_ASM_MTRR_H
+
+/* Has backtrace support */
+#undef HAVE_BACKTRACE
+
+/* Define to 1 if you have the <byteswap.h> header file. */
+#undef HAVE_BYTESWAP_H
+
+/* Define to 1 if you have cbrt */
+#undef HAVE_CBRT
+
+/* Define to 1 if you have the <dbm.h> header file. */
+#undef HAVE_DBM_H
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+#undef HAVE_DOPRNT
+
+/* Have execinfo.h */
+#undef HAVE_EXECINFO_H
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `geteuid' function. */
+#undef HAVE_GETEUID
+
+/* Define to 1 if you have the `getisax' function. */
+#undef HAVE_GETISAX
+
+/* Define to 1 if you have the `getuid' function. */
+#undef HAVE_GETUID
+
+/* Define to 1 if you have the `getzoneid' function. */
+#undef HAVE_GETZONEID
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Have Quartz */
+#undef XQUARTZ
+
+/* Support application updating through sparkle. */
+#undef XQUARTZ_SPARKLE
+
+/* Prefix to use for launchd identifiers */
+#undef LAUNCHD_ID_PREFIX
+
+/* Build a standalone xpbproxy */
+#undef STANDALONE_XPBPROXY
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the `link' function. */
+#undef HAVE_LINK
+
+/* Define to 1 if you have the <linux/agpgart.h> header file. */
+#undef HAVE_LINUX_AGPGART_H
+
+/* Define to 1 if you have the <linux/apm_bios.h> header file. */
+#undef HAVE_LINUX_APM_BIOS_H
+
+/* Define to 1 if you have the <linux/fb.h> header file. */
+#undef HAVE_LINUX_FB_H
+
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
+/* Define to 1 if you have the <ndbm.h> header file. */
+#undef HAVE_NDBM_H
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the <rpcsvc/dbm.h> header file. */
+#undef HAVE_RPCSVC_DBM_H
+
+/* Define to use libc SHA1 functions */
+#undef HAVE_SHA1_IN_LIBC
+
+/* Define to use CommonCrypto SHA1 functions */
+#undef HAVE_SHA1_IN_COMMONCRYPTO
+
+/* Define to use libmd SHA1 functions */
+#undef HAVE_SHA1_IN_LIBMD
+
+/* Define to use libgcrypt SHA1 functions */
+#undef HAVE_SHA1_IN_LIBGCRYPT
+
+/* Define to use libsha1 for SHA1 */
+#undef HAVE_SHA1_IN_LIBSHA1
+
+/* Define to 1 if you have the `shmctl64' function. */
+#undef HAVE_SHMCTL64
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if SYSV IPC is available */
+#undef HAVE_SYSV_IPC
+
+/* Define to 1 if you have the <sys/agpio.h> header file. */
+#undef HAVE_SYS_AGPIO_H
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/io.h> header file. */
+#undef HAVE_SYS_IO_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/vm86.h> header file. */
+#undef HAVE_SYS_VM86_H
+
+/* Define to 1 if you have the <tslib.h> header file. */
+#undef HAVE_TSLIB_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#undef HAVE_FNMATCH_H
+
+/* Have /dev/urandom */
+#undef HAVE_URANDOM
+
+/* Define to 1 if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
+
+/* Support IPv6 for TCP connections */
+#undef IPv6
+
+/* Support os-specific local connections */
+#undef LOCALCONN
+
+/* Support MIT-SHM Extension */
+#undef MITSHM
+
+/* Enable some debugging code */
+#undef DEBUG
+
+/* Name of package */
+#undef PACKAGE
+
+/* Internal define for Xinerama */
+#undef PANORAMIX
+
+/* Overall prefix */
+#undef PROJECTROOT
+
+/* Support RANDR extension */
+#undef RANDR
+
+/* Support Record extension */
+#undef XRECORD
+
+/* Support RENDER extension */
+#undef RENDER
+
+/* Support X resource extension */
+#undef RES
+
+/* Support MIT-SCREEN-SAVER extension */
+#undef SCREENSAVER
+
+/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */
+#undef SECURE_RPC
+
+/* Support SHAPE extension */
+#undef SHAPE
+
+/* Define to 1 on systems derived from System V Release 4 */
+#undef SVR4
+
+/* Support TCP socket connections */
+#undef TCPCONN
+
+/* Enable touchscreen support */
+#undef TOUCHSCREEN
+
+/* Support tslib touchscreen abstraction library */
+#undef TSLIB
+
+/* Support UNIX socket connections */
+#undef UNIXCONN
+
+/* Define to use byteswap macros from <sys/endian.h> */
+#undef USE_SYS_ENDIAN_H
+
+/* unaligned word accesses behave as expected */
+#undef WORKING_UNALIGNED_INT
+
+/* Build X string registry */
+#undef XREGISTRY
+
+/* Build X-ACE extension */
+#undef XACE
+
+/* Build SELinux extension */
+#undef XSELINUX
+
+/* Support XCMisc extension */
+#undef XCMISC
+
+/* Build Security extension */
+#undef XCSECURITY
+
+/* Support Xdmcp */
+#undef XDMCP
+
+/* Build XFree86 BigFont extension */
+#undef XF86BIGFONT
+
+/* Support XFree86 Video Mode extension */
+#undef XF86VIDMODE
+
+/* Support XFixes extension */
+#undef XFIXES
+
+/* Build XDGA support */
+#undef XFreeXDGA
+
+/* Support Xinerama extension */
+#undef XINERAMA
+
+/* Vendor release */
+#undef XORG_RELEASE
+
+/* Current Xorg version */
+#undef XORG_VERSION_CURRENT
+
+/* Xorg release date */
+#undef XORG_DATE
+
+/* Build Xv Extension */
+#undef XvExtension
+
+/* Build XvMC Extension */
+#undef XvMCExtension
+
+/* Support XSync extension */
+#undef XSYNC
+
+/* Support XTest extension */
+#undef XTEST
+
+/* Support Xv extension */
+#undef XV
+
+/* Build Multibuffer extension */
+#undef MULTIBUFFER
+
+/* Support DRI extension */
+#undef XF86DRI
+
+/* Build DRI2 extension */
+#undef DRI2
+
+/* Build DBE support */
+#undef DBE
+
+/* Vendor name */
+#undef XVENDORNAME
+
+/* Enable GNU and other extensions to the C environment for GLIBC */
+#undef _GNU_SOURCE
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Build Rootless code */
+#undef ROOTLESS
+
+/* Define to 1 if unsigned long is 64 bits. */
+#undef _XSERVER64
+
+/* System is BSD-like */
+#undef CSRG_BASED
+
+/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */
+#undef BSD44SOCKETS
+
+/* Support D-Bus */
+#undef HAVE_DBUS
+
+/* Use libudev for input hotplug */
+#undef CONFIG_UDEV
+
+/* Use D-Bus for input hotplug */
+#undef CONFIG_NEED_DBUS
+
+/* Support the D-Bus hotplug API */
+#undef CONFIG_DBUS_API
+
+/* Support HAL for hotplug */
+#undef CONFIG_HAL
+
+/* Use only built-in fonts */
+#undef BUILTIN_FONTS
+
+/* Have a monotonic clock from clock_gettime() */
+#undef MONOTONIC_CLOCK
+
+/* Define to 1 if the DTrace Xserver provider probes should be built in */
+#undef XSERVER_DTRACE
+
+/* Define to 16-bit byteswap macro */
+#undef bswap_16
+
+/* Define to 32-bit byteswap macro */
+#undef bswap_32
+
+/* Define to 64-bit byteswap macro */
+#undef bswap_64
+
+/* Need the strcasecmp function. */
+#undef NEED_STRCASECMP
+
+/* Need the strncasecmp function. */
+#undef NEED_STRNCASECMP
+
+/* Need the strcasestr function. */
+#undef NEED_STRCASESTR
+
+/* Define to 1 if you have the `ffs' function. */
+#undef HAVE_FFS
+
+/* Correctly set _XSERVER64 for OSX fat binaries */
+#ifdef __APPLE__
+#include "dix-config-apple-verbatim.h"
+#endif
+
+#endif /* _DIX_CONFIG_H_ */
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index ed3acb6c4..6505fd02f 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -576,8 +576,8 @@ typedef struct {
 extern _X_EXPORT CallbackListPtr DeviceEventCallback;
 
 typedef struct {
-    xEventPtr events;
-    int count;
+    InternalEvent *event;
+    DeviceIntPtr device;
 } DeviceEventInfoRec;
 
 extern int XItoCoreType(int xi_type);
@@ -585,7 +585,7 @@ extern Bool DevHasCursor(DeviceIntPtr pDev);
 extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev);
 extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev);
 extern Bool IsPointerEvent(InternalEvent *event);
-extern Bool IsMaster(DeviceIntPtr dev);
+extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev);
 
 extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
 extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
diff --git a/xorg-server/include/eventconvert.h b/xorg-server/include/eventconvert.h
index 277a6c4b8..b1196a00e 100644
--- a/xorg-server/include/eventconvert.h
+++ b/xorg-server/include/eventconvert.h
@@ -30,9 +30,9 @@
 
 #define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16))
 
-_X_INTERNAL int EventToCore(InternalEvent *event, xEvent *core);
-_X_INTERNAL int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
-_X_INTERNAL int EventToXI2(InternalEvent *ev, xEvent **xi);
+_X_EXPORT int EventToCore(InternalEvent *event, xEvent *core);
+_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
+_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi);
 _X_INTERNAL int GetCoreType(InternalEvent* ev);
 _X_INTERNAL int GetXIType(InternalEvent* ev);
 _X_INTERNAL int GetXI2Type(InternalEvent* ev);
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index dad1af787..453ab82c7 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -262,6 +262,8 @@ extern _X_EXPORT void OsBlockSignals (void);
 
 extern _X_EXPORT void OsReleaseSignals (void);
 
+extern _X_EXPORT void OsAbort (void);
+
 #if !defined(WIN32)
 extern _X_EXPORT int System(char *);
 extern _X_EXPORT pointer Popen(char *, char *);