mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-22 20:35:43 +00:00
Merge branch 'master' into XACE-SELINUX
This commit is contained in:
commit
23fc429aad
130 changed files with 13469 additions and 1166 deletions
|
|
@ -35,6 +35,9 @@
|
|||
/* Support Damage extension */
|
||||
#undef DAMAGE
|
||||
|
||||
/* Build for darwin with Quartz support */
|
||||
#undef DARWIN_WITH_QUARTZ
|
||||
|
||||
/* Use OsVendorInit */
|
||||
#undef DDXOSINIT
|
||||
|
||||
|
|
@ -423,7 +426,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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue