hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-22 20:35:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse source 
Conflicts:

	configure.ac
	dix/getevents.c
	hw/xfree86/ramdac/xf86Cursor.c
	mi/mipointer.c
	xkb/xkbUtils.c
This commit is contained in:
Peter Hutterer 2007-03-05 12:37:17 +10:30
commit 1f0075786f
176 changed files with 14384 additions and 1441 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/dix-config.h.in
View file

@ -15,6 +15,9 @@
/* Operating System Vendor */
#undef OSVENDOR
/* Builder string */
#undef BUILDERSTRING
/* Default font path */
#undef COMPILEDDEFAULTFONTPATH
@ -32,6 +35,9 @@
/* Support Damage extension */
#undef DAMAGE
/* Build for darwin with Quartz support */
#undef DARWIN_WITH_QUARTZ
/* Use OsVendorInit */
#undef DDXOSINIT
@ -417,7 +423,17 @@
#undef XVENDORNAME
/* Endian order */
#undef X_BYTE_ORDER
#undef _X_BYTE_ORDER
/* Deal with multiple architecture compiles on Mac OS X */
#ifndef __APPLE_CC__
#define X_BYTE_ORDER _X_BYTE_ORDER
#else
#ifdef __BIG_ENDIAN__
#define X_BYTE_ORDER X_BIG_ENDIAN
#else
#define X_BYTE_ORDER X_LITTLE_ENDIAN
#endif
#endif
/* Enable GNU and other extensions to the C environment for GLIBC */
#undef _GNU_SOURCE

12
include/xorg-server.h.in
View file

@ -191,7 +191,17 @@
#undef XVENDORNAME
/* Endian order */
#undef X_BYTE_ORDER
#undef _X_BYTE_ORDER
/* Deal with multiple architecture compiles on Mac OS X */
#ifndef __APPLE_CC__
#define X_BYTE_ORDER _X_BYTE_ORDER
#else
#ifdef __BIG_ENDIAN__
#define X_BYTE_ORDER X_BIG_ENDIAN
#else
#define X_BYTE_ORDER X_LITTLE_ENDIAN
#endif
#endif
/* BSD-compliant source */
#undef _BSD_SOURCE