Conflicts:
hw/xfree86/common/xf86Init.c
hw/xfree86/int10/pci.c
hw/xfree86/scanpci/xf86PciData.h
hw/xfree86/scanpci/xf86PciStdIds.h
hw/xfree86/scanpci/xf86PciStr.h
hw/xfree86/scanpci/xf86ScanPci.h
hw/xfree86/utils/pcitweak/pcitweak.c
hw/xfree86/utils/scanpci/scanpci.c
Re-removed most of the conflicting files.
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
Add prototype for XkbSetExtension()
Add #include <ctype.h> for isspace() & isdigit()
Add #include <grp.h> (for initgroups()) and remove extra *
Add prototype for xorgGetVersion()
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
Remove old obsolete include/extensions/damage.h.
Include srvrv_ctrl(xfree86) in macintosh US XKB symbol file so VT switching
works again on mac (#1872).
Remove out of place #define's of printf to xf86printf. This definition
should only be in xfree86/os-support/xf86_libc.h
